Merge lp:~henninge/launchpad/bug-482267 into lp:launchpad

[Henning Eggers]

[Henning Eggers (henninge)]

This is a continuation of this proposal:
https://code.edge.launchpad.net/~henninge/launchpad/bug-422466-api/+merge/14841

This branch is properly based on devel with no other prerequisite.

[Henning Eggers (henninge)]

Here is the incremental diffs wrt the previous review.

=== modified file 'lib/lp/translations/model/translationimportqueue.py'
--- lib/lp/translations/model/translationimportqueue.py 2009-11-17 09:50:33 +0000
+++ lib/lp/translations/model/translationimportqueue.py 2009-11-17 10:55:09 +0000
@@ -310,7 +310,7 @@
             # that's only possible if we know where to import it
             # (import_into not None).
             return False
- if (new_status == RosettaImportStatus.BLOCKED and not can_admin):
+ if new_status == RosettaImportStatus.BLOCKED and not can_admin:
             # Only administrators are able to set an entry to BLOCKED.
             return False
         if (new_status in (RosettaImportStatus.FAILED,
@@ -319,7 +319,7 @@
             # Only scripts set these statuses and they report as a rosetta
             # expert.
             return False
- return (self.isUserUploaderOrOwner(user) or can_admin)
+ return self.isUserUploaderOrOwner(user) or can_admin

     def setStatus(self, new_status, user):
         """See `ITranslationImportQueueEntry`."""

=== modified file 'lib/lp/translations/tests/test_translationimportqueue.py'
--- lib/lp/translations/tests/test_translationimportqueue.py 2009-11-17 09:51:40 +0000
+++ lib/lp/translations/tests/test_translationimportqueue.py 2009-11-17 11:03:11 +0000
@@ -17,14 +17,14 @@
 from canonical.testing import LaunchpadZopelessLayer

-class TestTranslationImpportQueueEntryStatus(TestCaseWithFactory):
+class TestTranslationImportQueueEntryStatus(TestCaseWithFactory):
     """Test handling of the status of a queue entry."""

     layer = LaunchpadZopelessLayer

     def setUp(self):
         """Set up context to test in."""
- super(TestTranslationImpportQueueEntryStatus, self).setUp()
+ super(TestTranslationImportQueueEntryStatus, self).setUp()

         self.queue = getUtility(ITranslationImportQueue)
         self.rosetta_experts = (
@@ -100,7 +100,7 @@
             self.factory.makeTranslationGroup(self.ubuntu_group_owner))

     def test_canSetStatus_ubuntu_translation_group(self):
- # Owners of the Ubuntu translation Groups can set entries
+ # Owners of the Ubuntu translation Groups can set entries to approved
         # that are targeted to Ubuntu.
         self._setUpUbuntu()
         ubuntu_entry = self.queue.addOrUpdateEntry(

[Henning Eggers (henninge)]

This is the diff-diff, comparing the branch from the first proposal and this branch before the above changes were made. It shows that the changes are identical and that the additional symlink does not appear here.

0a1,2
> === added symlink 'lib/canonical/launchpad/icing/yui'
> === target is u'../../../../lazr-js/build/yui'
2,3c4,5
< --- lib/canonical/launchpad/security.py 2009-11-15 01:05:49 +0000
< +++ lib/canonical/launchpad/security.py 2009-11-17 09:51:03 +0000
---
> --- lib/canonical/launchpad/security.py 2009-11-13 05:13:07 +0000
> +++ lib/canonical/launchpad/security.py 2009-11-13 18:41:14 +0000
46c48
< @@ -1278,10 +1275,8 @@
---
> @@ -1310,10 +1307,8 @@
59c61
< @@ -1291,11 +1286,12 @@
---
> @@ -1323,11 +1318,12 @@
77c79
< +++ lib/lp/translations/browser/hastranslationimports.py 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/browser/hastranslationimports.py 2009-11-13 18:41:14 +0000
103c105
< +++ lib/lp/translations/browser/translationimportqueue.py 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/browser/translationimportqueue.py 2009-11-13 18:41:14 +0000
116c118
< +++ lib/lp/translations/doc/poexport-language-pack.txt 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/doc/poexport-language-pack.txt 2009-11-13 18:41:14 +0000
146c148
< +++ lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt 2009-11-13 18:41:14 +0000
185c187
< +++ lib/lp/translations/doc/poimport-pofile-old-po-imported.txt 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/doc/poimport-pofile-old-po-imported.txt 2009-11-13 18:41:14 +0000
234c236
< +++ lib/lp/translations/doc/poimport-pofile-syntax-error.txt 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/doc/poimport-pofile-syntax-error.txt 2009-11-13 18:41:14 +0000
319c321
< +++ lib/lp/translations/doc/poimport-potemplate-syntax-error.txt 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/doc/poimport-potemplate-syntax-error.txt 2009-11-13 18:41:14 +0000
358c360
< +++ lib/lp/translations/doc/poimport.txt 2009-11-17 09:51:03 +0000
---
> +++ lib/lp/translations/doc/poimport.txt 2009-11-13 18:41:14 +0000
494c496
< +++ lib/lp/translations/doc/rosetta-karma.txt 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/doc/rosetta-karma.txt 2009-11-13 18:41:14 +0000
552c554
< +++ lib/lp/translations/doc/rosetta-poimport-script.txt 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/doc/rosetta-poimport-script.txt 2009-11-13 18:41:14 +0000
583c585
< +++ lib/lp/translations/doc/translationimportqueue.txt 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/doc/translationimportqueue.txt 2009-11-13 18:41:14 +0000
835c837
< +++ lib/lp/translations/interfaces/translationimportqueue.py 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/interfaces/translationimportqueue.py 2009-11-13 18:41:14 +0000
920c922
< +++ lib/lp/translations/model/pofile.py 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/model/pofile.py 2009-11-13 18:41:14 +0000
948c950
< +++ lib/lp/translations/model/potemplate.py 2009-11-17 09:49:17 +0000
---
> +++ lib/lp/translations/model/pote...

[Edwin Grubbs (edwin-grubbs)]

Hi Henning,

Your changes look good. I just have one suggestion below.

merge-approved

-Edwin

>>> + if (new_status == RosettaImportStatus.APPROVED and
>>> + not (self.import_into is not None and can_admin)):
>>
>>
>> I think it would be clearer without the double negatives.
>> if (new_status == RosettaImportStatus.APPROVED and
>> (self.import_into is None or not can_admin)):
>
>Actually, that is what I changed this line from (previously in the view
>code) because I think "and" is easier to understand here. It derives
>more directly from the definition "an entry can be approved by an admin
>but only if we have an import target".
>
>So, I like this better but if you insist, will change it back ... ;)

Here is another thought of how you can keep the "and" but get rid of the
double negative. You can take it or leave it.

    if new_status == RosettaImportStatus.APPROVED:
        if can_admin and self.import_into is None:
            pass
        else:
            return False

review: Approve (code)

[Henning Eggers (henninge)]

Am 17.11.2009 17:14, Edwin Grubbs schrieb:
> Review: Approve code
> Hi Henning,
>
> Your changes look good. I just have one suggestion below.
>
> merge-approved
>

Thank you very much! ;)

> Here is another thought of how you can keep the "and" but get rid of the
> double negative. You can take it or leave it.
>
> if new_status == RosettaImportStatus.APPROVED:
> if can_admin and self.import_into is None:
> pass
> else:
> return False
>

Ah, good idea. I was not really happy with the flow in setStatus anyway,
all these "return False" were confusing. I changed similar to your
suggestions that is much clearer (and has no double negative ;).
Incremental diff will be pasted.

Henning

[Henning Eggers (henninge)]

=== modified file 'lib/lp/translations/model/translationimportqueue.py'
--- lib/lp/translations/model/translationimportqueue.py 2009-11-17 11:05:58 +0000
+++ lib/lp/translations/model/translationimportqueue.py 2009-11-18 11:41:37 +0000
@@ -304,21 +304,20 @@
             return False
         can_admin = (is_admin_or_rosetta_expert(user) or
                      self.isUbuntuAndIsUserTranslationGroupOwner(user))
- if (new_status == RosettaImportStatus.APPROVED and
- not (self.import_into is not None and can_admin)):
+ if new_status == RosettaImportStatus.APPROVED:
             # Only administrators are able to set the APPROVED status, and
             # that's only possible if we know where to import it
             # (import_into not None).
- return False
- if new_status == RosettaImportStatus.BLOCKED and not can_admin:
+ return can_admin and self.import_into is not None
+ if new_status == RosettaImportStatus.BLOCKED:
             # Only administrators are able to set an entry to BLOCKED.
- return False
+ return can_admin
         if (new_status in (RosettaImportStatus.FAILED,
- RosettaImportStatus.IMPORTED)
- and not is_admin_or_rosetta_expert(user)):
+ RosettaImportStatus.IMPORTED)):
             # Only scripts set these statuses and they report as a rosetta
             # expert.
- return False
+ return is_admin_or_rosetta_expert(user)
+ # All other statuses can bset set by all authorized persons.
         return self.isUserUploaderOrOwner(user) or can_admin

     def setStatus(self, new_status, user):

=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2009-11-15 01:05:49 +0000
+++ lib/canonical/launchpad/security.py	2009-11-18 11:51:13 +0000
@@ -10,6 +10,7 @@
 from zope.component import getUtility
 
 from canonical.launchpad.interfaces.account import IAccount
+from canonical.launchpad.interfaces.emailaddress import IEmailAddress
 from lp.archiveuploader.permission import verify_upload
 from lp.registry.interfaces.announcement import IAnnouncement
 from lp.soyuz.interfaces.archive import IArchive
@@ -48,7 +49,8 @@
 from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.translations.interfaces.distroserieslanguage import (
     IDistroSeriesLanguage)
-from canonical.launchpad.interfaces.emailaddress import IEmailAddress
+from lp.translations.utilities.permission_helpers import (
+    is_admin_or_rosetta_expert)
 from lp.registry.interfaces.entitlement import IEntitlement
 from canonical.launchpad.interfaces.hwdb import (
     IHWDBApplication, IHWDevice, IHWDeviceClass, IHWDriver, IHWDriverName,
@@ -475,10 +477,7 @@
 
     def checkAuthenticated(self, user):
         """Allow Launchpad's admins and Rosetta experts edit all fields."""
-        celebrities = getUtility(ILaunchpadCelebrities)
-        return (user.inTeam(celebrities.admin) or
-                user.inTeam(celebrities.rosetta_experts))
-
+        return is_admin_or_rosetta_expert(user)
 
 class AdminProductTranslations(AuthorizationBase):
     permission = 'launchpad.TranslationsAdmin'
@@ -490,10 +489,8 @@
         Any Launchpad/Launchpad Translations administrator or owners are
         able to change translation settings for a product.
         """
-        celebrities = getUtility(ILaunchpadCelebrities)
         return (user.inTeam(self.obj.owner) or
-                user.inTeam(celebrities.admin) or
-                user.inTeam(celebrities.rosetta_experts))
+                is_admin_or_rosetta_expert(user))
 
 
 class AdminSeriesByVCSImports(AuthorizationBase):
@@ -1278,10 +1275,8 @@
 
         # As a special case, the Ubuntu translation group owners can
         # manage Ubuntu uploads.
-        if self.obj.is_targeted_to_ubuntu:
-            group = self.obj.distroseries.distribution.translationgroup
-            if group is not None and user.inTeam(group.owner):
-                return True
+        if self.obj.isUbuntuAndIsUserTranslationGroupOwner(user):
+            return True
 
         return False
 
@@ -1291,11 +1286,12 @@
     usedfor = ITranslationImportQueueEntry
 
     def checkAuthenticated(self, user):
-        """Anyone who can admin an entry, plus its owner, can edit it.
+        """Anyone who can admin an entry, plus its owner or the owner of the
+        product or distribution, can edit it.
         """
         if AdminTranslationImportQueueEntry.checkAuthenticated(self, user):
             return True
-        if user.inTeam(self.obj.importer):
+        if self.obj.isUserUploaderOrOwner(user):
             return True
 
         return False

=== modified file 'lib/lp/translations/browser/hastranslationimports.py'
--- lib/lp/translations/browser/hastranslationimports.py	2009-09-17 20:11:48 +0000
+++ lib/lp/translations/browser/hastranslationimports.py	2009-11-18 11:51:13 +0000
@@ -223,17 +223,17 @@
             # special permissions to change status.
             if (new_status_name == RosettaImportStatus.DELETED.name and
                 check_permission('launchpad.Edit', entry)):
-                entry.setStatus(RosettaImportStatus.DELETED)
+                entry.setStatus(RosettaImportStatus.DELETED, self.user)
             elif (new_status_name == RosettaImportStatus.BLOCKED.name and
                   check_permission('launchpad.Admin', entry)):
-                entry.setStatus(RosettaImportStatus.BLOCKED)
+                entry.setStatus(RosettaImportStatus.BLOCKED, self.user)
             elif (new_status_name == RosettaImportStatus.APPROVED.name and
                   check_permission('launchpad.Admin', entry) and
                   entry.import_into is not None):
-                entry.setStatus(RosettaImportStatus.APPROVED)
+                entry.setStatus(RosettaImportStatus.APPROVED, self.user)
             elif (new_status_name == RosettaImportStatus.NEEDS_REVIEW.name and
                   check_permission('launchpad.Admin', entry)):
-                entry.setStatus(RosettaImportStatus.NEEDS_REVIEW)
+                entry.setStatus(RosettaImportStatus.NEEDS_REVIEW, self.user)
             else:
                 # The user was not the importer or we are trying to set a
                 # status that must not be set from this form. That means that

=== modified file 'lib/lp/translations/browser/translationimportqueue.py'
--- lib/lp/translations/browser/translationimportqueue.py	2009-09-17 20:11:48 +0000
+++ lib/lp/translations/browser/translationimportqueue.py	2009-11-18 11:51:13 +0000
@@ -414,7 +414,7 @@
         # Store the associated IPOTemplate.
         self.context.potemplate = potemplate
 
-        self.context.setStatus(RosettaImportStatus.APPROVED)
+        self.context.setStatus(RosettaImportStatus.APPROVED, self.user)
         self.context.date_status_changed = UTC_NOW
 
 

=== modified file 'lib/lp/translations/doc/poexport-language-pack.txt'
--- lib/lp/translations/doc/poexport-language-pack.txt	2009-08-13 19:03:36 +0000
+++ lib/lp/translations/doc/poexport-language-pack.txt	2009-11-18 11:51:13 +0000
@@ -12,10 +12,12 @@
     >>> import transaction
     >>> from canonical.launchpad.ftests import login
     >>> from canonical.launchpad.helpers import string_to_tarfile
+    >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
     >>> from lp.translations.scripts.language_pack import \
     ...    export_language_pack
     >>> from canonical.librarian.interfaces import ILibrarianClient
     >>> from canonical.database.sqlbase import flush_database_caches
+    >>> rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
     >>> login("[e-mail]")
 
     # This is a dummy logger class to capture the export's log messages.
@@ -183,8 +185,10 @@
 Before we are ready to import the attached files, we need to approve
 them first.
 
-    >>> template_entry.setStatus(RosettaImportStatus.APPROVED)
-    >>> translation_entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> template_entry.setStatus(
+    ...     RosettaImportStatus.APPROVED, rosetta_experts)
+    >>> translation_entry.setStatus(
+    ...     RosettaImportStatus.APPROVED, rosetta_experts)
 
 Given that the files are attached to Librarian, we need to commit the
 transaction to make sure it's stored properly and available.

=== modified file 'lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt'
--- lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt	2009-11-18 11:51:13 +0000
@@ -19,13 +19,15 @@
 
 Here are some imports we need to get this test running.
 
-    >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> from canonical.launchpad.interfaces import (
+    ...     ILaunchpadCelebrities, IPersonSet)
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue, RosettaImportStatus)
     >>> from lp.translations.model.potemplate import POTemplateSubset
     >>> import pytz
     >>> UTC = pytz.timezone('UTC')
     >>> translation_import_queue = getUtility(ITranslationImportQueue)
+    >>> rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
 
 We need this for the Librarian to work properly.
 
@@ -80,7 +82,7 @@
 
 We must approve the entry to be able to import it.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
 
 We do the import.
 
@@ -150,7 +152,7 @@
 
 We must approve the entry to be able to import it.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
 
 We do the import.
 

=== modified file 'lib/lp/translations/doc/poimport-pofile-old-po-imported.txt'
--- lib/lp/translations/doc/poimport-pofile-old-po-imported.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/translations/doc/poimport-pofile-old-po-imported.txt	2009-11-18 11:51:13 +0000
@@ -16,7 +16,8 @@
 
 Here are some imports we need to get this test running.
 
-    >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> from canonical.launchpad.interfaces import (
+    ...     ILaunchpadCelebrities, IPersonSet)
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue)
     >>> from lp.translations.model.potemplate import POTemplateSubset
@@ -24,6 +25,7 @@
     >>> import pytz
     >>> UTC = pytz.timezone('UTC')
     >>> translation_import_queue = getUtility(ITranslationImportQueue)
+    >>> rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
 
 And also, the DBSchema to change the imports status
 
@@ -80,7 +82,7 @@
 
 We must approve the entry to be able to import it.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
 
 We do the import.  This succeeds without errors.
 
@@ -128,7 +130,7 @@
 
 We must approve the entry to be able to import it.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
 
 We do the import.
 
@@ -191,7 +193,7 @@
 
 We approve the entry and import it.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = pofile.importFromQueue(entry)
 
 This succeeds although the file's timestamp is older than that of the

=== modified file 'lib/lp/translations/doc/poimport-pofile-syntax-error.txt'
--- lib/lp/translations/doc/poimport-pofile-syntax-error.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/translations/doc/poimport-pofile-syntax-error.txt	2009-11-18 11:51:13 +0000
@@ -7,7 +7,8 @@
 
 Here are some imports we need to get this test running.
 
-    >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> from canonical.launchpad.interfaces import (
+    ...     ILaunchpadCelebrities, IPersonSet)
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue)
     >>> from lp.translations.model.potemplate import POTemplateSubset
@@ -15,6 +16,7 @@
     >>> import pytz
     >>> UTC = pytz.timezone('UTC')
     >>> translation_import_queue = getUtility(ITranslationImportQueue)
+    >>> rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
 
 We need this for the Librarian to work properly.
 
@@ -76,7 +78,7 @@
 
 We must approve the entry to be able to import it.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
 
 The import fails.
 
@@ -135,7 +137,7 @@
     >>> entry = translation_import_queue.addOrUpdateEntry(
     ...     pofile.path, pofile_contents, published, person,
     ...     productseries=series, potemplate=potemplate, pofile=pofile)
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> transaction.commit()
     >>> (subject, message) = pofile.importFromQueue(entry)
     >>> print entry.status.name
@@ -202,7 +204,7 @@
     ...     pofile.path, pofile_contents, False, person,
     ...     productseries=series, potemplate=potemplate, pofile=pofile)
     >>> transaction.commit()
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = pofile.importFromQueue(entry)
 
 
@@ -245,7 +247,7 @@
     ...     pofile.path, pofile_contents, False, person,
     ...     productseries=series, potemplate=potemplate, pofile=pofile)
     >>> transaction.commit()
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = pofile.importFromQueue(entry)
 
     >>> print entry.status.name
@@ -283,7 +285,7 @@
     ...     pofile.path, pofile_contents, False, person,
     ...     productseries=series, potemplate=potemplate, pofile=pofile)
     >>> transaction.commit()
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = pofile.importFromQueue(entry)
 
     >>> print entry.status.name
@@ -336,7 +338,7 @@
     ...     pofile.path, pofile_contents, False, person,
     ...     productseries=series, potemplate=potemplate, pofile=pofile)
     >>> transaction.commit()
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = pofile.importFromQueue(entry)
 
     >>> print entry.status.name
@@ -398,7 +400,7 @@
     ...     pofile.path, pofile_contents, False, person,
     ...     productseries=series, potemplate=potemplate, pofile=pofile)
     >>> transaction.commit()
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = pofile.importFromQueue(entry)
 
     >>> print entry.status.name

=== modified file 'lib/lp/translations/doc/poimport-potemplate-syntax-error.txt'
--- lib/lp/translations/doc/poimport-potemplate-syntax-error.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/translations/doc/poimport-potemplate-syntax-error.txt	2009-11-18 11:51:13 +0000
@@ -7,13 +7,15 @@
 
 Here are some imports we need to get this test running.
 
-    >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> from canonical.launchpad.interfaces import (
+    ...     ILaunchpadCelebrities, IPersonSet)
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue)
     >>> from lp.translations.model.potemplate import POTemplateSubset
     >>> import pytz
     >>> UTC = pytz.timezone('UTC')
     >>> translation_import_queue = getUtility(ITranslationImportQueue)
+    >>> rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
 
 We need this for the Librarian to work properly.
 
@@ -59,7 +61,7 @@
     ...     potemplate.path, potemplate_contents, published, person,
     ...     productseries=series, potemplate=potemplate)
     >>> transaction.commit()
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = potemplate.importFromQueue(entry)
 
 The import failed.
@@ -120,7 +122,7 @@
     ...     potemplate.path, potemplate_contents, published, person,
     ...     productseries=series, potemplate=potemplate)
     >>> transaction.commit()
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = potemplate.importFromQueue(entry)
 
 The import failed.

=== modified file 'lib/lp/translations/doc/poimport.txt'
--- lib/lp/translations/doc/poimport.txt	2009-10-29 17:46:00 +0000
+++ lib/lp/translations/doc/poimport.txt	2009-11-18 11:51:13 +0000
@@ -21,6 +21,7 @@
     >>> import datetime
     >>> import pytz
     >>> UTC = pytz.timezone('UTC')
+    >>> rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
 
 We need this for the Librarian to work properly.
 
@@ -125,7 +126,7 @@
 
 The entry gets approved, so it can be imported.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
 
     >>> import datetime
     >>> import pytz
@@ -201,7 +202,7 @@
 The entry indicates what file it is to be imported to; importing it to
 any other file would be an error.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> from lp.translations.interfaces.potemplate import IPOTemplateSet
     >>> other_product = getUtility(IProductSet).getByName('netapplet')
     >>> other_productseries = other_product.getSeries('trunk')
@@ -306,7 +307,7 @@
 
 We must approve the entry to be able to import it.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
 
 And we do the import.
 
@@ -448,7 +449,7 @@
     ...     productseries=series, potemplate=potemplate,
     ...     pofile=sumerian_pofile)
     >>> transaction.commit()
-    >>> warning_entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> warning_entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = sumerian_pofile.importFromQueue(warning_entry)
 
 The warning is noted in the confirmation email.  Note that this
@@ -477,14 +478,13 @@
     <BLANKLINE>
     Line 12: We got a second header.
 
-    >>> warning_entry.setStatus(RosettaImportStatus.DELETED)
+    >>> warning_entry.setStatus(RosettaImportStatus.DELETED, rosetta_experts)
 
 
 === Import Without Errors ===
 
 Now, let's import one without errors.
 
-    >>> rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
     >>> pofile_without_errors = r'''
     ... msgid ""
     ... msgstr ""
@@ -522,7 +522,7 @@
 
 We must approve the entry to be able to import it.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
 
 At this point, the statistics note that we have 2 translations coming
 from imported files (currentCount), and none updated in Launchpad
@@ -608,7 +608,7 @@
 The entry indicates what file it is to be imported to; importing it to
 any other file would be an error.
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> other_pofile = potemplate.newPOFile('de')
     >>> other_pofile.importFromQueue(entry)
     Traceback (most recent call last):
@@ -638,7 +638,7 @@
     ...     if (entry.status == RosettaImportStatus.IMPORTED or
     ...         entry.status == RosettaImportStatus.FAILED) and (
     ...         entry.productseries == series):
-    ...         entry.setStatus(RosettaImportStatus.APPROVED)
+    ...         entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     ...     syncUpdate(entry)
     >>> transaction.commit()
 
@@ -859,7 +859,7 @@
     ...     potemplate.path, potemplate_contents, True, potemplate.owner,
     ...     sourcepackagename=firefox_name, distroseries=warty,
     ...     potemplate=potemplate)
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> syncUpdate(entry)
     >>> transaction.commit()
 
@@ -941,7 +941,7 @@
     >>> # Allow Librarian to see the change.
     >>> transaction.commit()
     >>> entry.pofile = firefox_dv
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, body) = firefox_dv.importFromQueue(entry, FakeLogger())
     >>> flush_database_updates()
     >>> print entry.status.name
@@ -989,7 +989,7 @@
     ...     productseries=pofile.potemplate.productseries,
     ...     potemplate=pofile.potemplate, pofile=pofile)
     >>> transaction.commit()
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = pofile.importFromQueue(entry)
 
 Import succeeds but no email is sent out.
@@ -1008,7 +1008,7 @@
     ...     productseries=pofile.potemplate.productseries,
     ...     potemplate=pofile.potemplate, pofile=pofile)
     >>> transaction.commit()
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> (subject, message) = pofile.importFromQueue(entry)
 
 Import fails and email is sent out even though it's a published upload.
@@ -1042,7 +1042,7 @@
     ...     'lo.po', 'Invalid content', True, hermit,
     ...     pofile=pofile, potemplate=pofile.potemplate,
     ...     productseries=pofile.potemplate.productseries)
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> transaction.commit()
 
 The import fails.  The importer would like to send Kermit an email about

=== modified file 'lib/lp/translations/doc/rosetta-karma.txt'
--- lib/lp/translations/doc/rosetta-karma.txt	2009-07-23 17:49:31 +0000
+++ lib/lp/translations/doc/rosetta-karma.txt	2009-11-18 11:51:13 +0000
@@ -58,7 +58,7 @@
 
     # Login as a rosetta expert to be able to change the import's status.
     >>> login('[e-mail]')
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> entry_id = entry.id
 
 The file data is stored in the Librarian, so we have to commit the transaction
@@ -90,7 +90,7 @@
     ...     potemplate.path, potemplate_contents, comes_from_upstream,
     ...     foo_bar, productseries=potemplate.productseries,
     ...     potemplate=potemplate)
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> entry_id = entry.id
 
 The file data is stored in the Librarian, so we have to commit the transaction
@@ -146,7 +146,7 @@
     ...     pofile.path, pofile_contents, comes_from_upstream,
     ...     rosetta_experts, productseries=potemplate.productseries,
     ...     potemplate=potemplate, pofile=pofile)
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> entry_id = entry.id
 
 The file data is stored in the Librarian, so we have to commit the transaction
@@ -173,7 +173,7 @@
     ...     pofile.path, pofile_contents, comes_from_upstream, foo_bar,
     ...     productseries=potemplate.productseries, potemplate=potemplate,
     ...     pofile=pofile)
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> entry_id = entry.id
 
 The file data is stored in the Librarian, so we have to commit the transaction
@@ -210,7 +210,7 @@
     ...     pofile.path, pofile_contents, not comes_from_upstream, foo_bar,
     ...     productseries=potemplate.productseries, potemplate=potemplate,
     ...     pofile=pofile)
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> entry_id = entry.id
 
 The file data is stored in the Librarian, so we have to commit the transaction
@@ -242,7 +242,7 @@
     ...     pofile.path, pofile_contents, not comes_from_upstream, foo_bar,
     ...     productseries=potemplate.productseries, potemplate=potemplate,
     ...     pofile=pofile)
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> entry_id = entry.id
 
 The file data is stored in the Librarian, so we have to commit the transaction

=== modified file 'lib/lp/translations/doc/rosetta-poimport-script.txt'
--- lib/lp/translations/doc/rosetta-poimport-script.txt	2009-07-02 17:16:50 +0000
+++ lib/lp/translations/doc/rosetta-poimport-script.txt	2009-11-18 11:51:13 +0000
@@ -1,7 +1,8 @@
 =  PO import script =
 
     >>> from lp.translations.model.potemplate import POTemplate
-    >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> from canonical.launchpad.interfaces import (
+    ...     ILaunchpadCelebrities, IPersonSet)
     >>> from lp.translations.interfaces.translationimportqueue import (
     ...     ITranslationImportQueue,
     ...     RosettaImportStatus)
@@ -9,6 +10,7 @@
     >>> import datetime
     >>> import pytz
     >>> UTC = pytz.timezone('UTC')
+    >>> rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
 
 Login as an admin to be able to do changes to the import queue.
 
@@ -66,7 +68,7 @@
     ...     distroseries=pofile.potemplate.distroseries,
     ...     productseries=pofile.potemplate.productseries)
     >>> entry.pofile = pofile
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> transaction.commit()
     >>> translation_import_queue.countEntries()
     1

=== modified file 'lib/lp/translations/doc/translationimportqueue.txt'
--- lib/lp/translations/doc/translationimportqueue.txt	2009-10-01 07:04:18 +0000
+++ lib/lp/translations/doc/translationimportqueue.txt	2009-11-18 11:51:13 +0000
@@ -136,7 +136,7 @@
 we need to be logged in as an admin.
 
     >>> login('[e-mail]')
-    >>> entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
 
 The status change updates date_status_changed as well.
 
@@ -202,7 +202,7 @@
 
 But if that entry is imported, the guessing algorithm works.
 
-    >>> pot_entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> guessed_pofile = po_sr_entry.getGuessedPOFile()
     >>> guessed_pofile is None
     False
@@ -276,7 +276,7 @@
 
 And set this entry as already imported.
 
-    >>> kde_pot_entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> kde_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file from kde-i18n-es
@@ -342,7 +342,7 @@
 
 And set this entry as already imported.
 
-    >>> kde_pot_entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> kde_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file from kde-i18n-es
@@ -402,7 +402,7 @@
 
 And set this entry as already imported.
 
-    >>> koffice_pot_entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> koffice_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file from koffice-l10n
@@ -500,7 +500,7 @@
 
 And set this entry as already imported.
 
-    >>> adept_pot_entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> adept_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file now.
@@ -551,7 +551,7 @@
 
 And set this entry as already imported.
 
-    >>> ktorrent_pot_entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> ktorrent_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file now.
@@ -604,7 +604,7 @@
 
 And set this entry as already imported.
 
-    >>> zope_pot_entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> zope_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file now.
@@ -656,7 +656,7 @@
 
 And set this entry as already imported.
 
-    >>> k3b_pot_entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> k3b_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file now.
@@ -706,7 +706,7 @@
 
 And set this entry as already imported.
 
-    >>> k3b_pot_entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> k3b_pot_entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> flush_database_updates()
 
 Let's attach a .po file now.
@@ -782,7 +782,7 @@
 
 We need it blocked for this test.
 
-    >>> entry5.setStatus(RosettaImportStatus.BLOCKED)
+    >>> entry5.setStatus(RosettaImportStatus.BLOCKED, rosetta_experts)
 
 Let's see how many entries are blocked.
 
@@ -873,7 +873,7 @@
 For the third entry, we have one .pot file on that directory, which is already
 in sample data.
 
-    >>> entry3.setStatus(RosettaImportStatus.NEEDS_REVIEW)
+    >>> entry3.setStatus(RosettaImportStatus.NEEDS_REVIEW, rosetta_experts)
     >>> entries = entry3.getTemplatesOnSameDirectory()
     >>> entries.count()
     1
@@ -884,7 +884,7 @@
 
 For the fourth entry, we have one.
 
-    >>> entry4.setStatus(RosettaImportStatus.NEEDS_REVIEW)
+    >>> entry4.setStatus(RosettaImportStatus.NEEDS_REVIEW, rosetta_experts)
     >>> entries = entry4.getTemplatesOnSameDirectory()
     >>> entries.count()
     1
@@ -898,7 +898,7 @@
 obviously, we are not returning it as being at the same directory as it makes
 no sense at all.
 
-    >>> entry5.setStatus(RosettaImportStatus.NEEDS_REVIEW)
+    >>> entry5.setStatus(RosettaImportStatus.NEEDS_REVIEW, rosetta_experts)
     >>> entries = entry5.getTemplatesOnSameDirectory()
     >>> entries.count()
     0
@@ -967,10 +967,17 @@
     NEEDS_REVIEW
 
 Now we approve these entries (we need to be Rosetta administrator to do this).
+We also need to set an import target.
 
     >>> login('[e-mail]')
-    >>> entry1.setStatus(RosettaImportStatus.APPROVED)
-    >>> entry2.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry1.potemplate = factory.makePOTemplate(
+    ...     distroseries=hoary_distroseries,
+    ...     sourcepackagename=evolution_sourcepackagename)
+    >>> entry1.pofile = factory.makePOFile('sr', potemplate=entry1.potemplate)
+    >>> entry1.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
+    >>> entry2.potemplate = factory.makePOTemplate(
+    ...     productseries=productseries)
+    >>> entry2.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
 
     >>> flush_database_updates()
     >>> translationimportqueue = getUtility(ITranslationImportQueue)
@@ -1100,8 +1107,8 @@
 
     >>> queue = getUtility(ITranslationImportQueue)
     >>> print_queue_entries(queue)
-    hoary evolution | None               | po/sr.po
-    firefox         | None               | foo/bar.pot
+    hoary evolution | generic-string1    | po/sr.po
+    firefox         | generic-string3    | foo/bar.pot
     evolution       | evolution-2.2-test | po/evolution-2.2-test.pot
     evolution       | evolution-2.2-test | po/pt_BR.po
     firefox         | None               | foo/bar.po
@@ -1121,8 +1128,8 @@
 And those new entries in the queue appear in the list.
 
     >>> print_queue_entries(queue)
-    hoary evolution | None               | po/sr.po
-    firefox         | None               | foo/bar.pot
+    hoary evolution | generic-string1    | po/sr.po
+    firefox         | generic-string3    | foo/bar.pot
     evolution       | evolution-2.2-test | po/evolution-2.2-test.pot
     evolution       | evolution-2.2-test | po/pt_BR.po
     firefox         | None               | foo/bar.po
@@ -1320,7 +1327,8 @@
     >>> entry.import_into is None
     True
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+Set the entry to approved, which is only possible if we don't use setStatus.
+    >>> removeSecurityProxy(entry).status = RosettaImportStatus.APPROVED
 
     >>> import logging
     >>> from canonical.launchpad.scripts import FakeLogger
@@ -1355,7 +1363,8 @@
     >>> entry.import_into is None
     True
 
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+Set the entry to approved, which is only possible if we don't use setStatus.
+    >>> removeSecurityProxy(entry).status = RosettaImportStatus.APPROVED
 
     >>> script = TranslationsImport('poimport', test_args=[])
     >>> script.logger.setLevel(logging.FATAL)
@@ -1382,11 +1391,13 @@
     ...     distro = distroset[distro_name]
     ...     series = distro.getSeries(series_name)
     ...     package = packageset['pmount']
+    ...     template = factory.makePOTemplate(distroseries=series,
+    ...                                       sourcepackagename=package)
     ...     # In a completely arbitrary move, we make all import requests for
     ...     # distro series imported.
     ...     return translationimportqueue.addOrUpdateEntry('messages.pot',
     ...         'dummy file', True, rosetta_experts, distroseries=series,
-    ...         sourcepackagename=package)
+    ...         sourcepackagename=package, potemplate=template)
 
     >>> def create_product_request(product_name, template_name):
     ...     """Enqueue an import request for given product and template."""
@@ -1403,19 +1414,19 @@
 
     >>> # Populate import queue with wild mix of requests.
     >>> entry = create_product_request('evolution', 'evolution-2.2')
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> entry = create_distro_request('debian', 'sarge')
-    >>> entry.setStatus(RosettaImportStatus.NEEDS_REVIEW)
+    >>> entry.setStatus(RosettaImportStatus.NEEDS_REVIEW, rosetta_experts)
     >>> entry = create_product_request('alsa-utils', 'alsa-utils')
-    >>> entry.setStatus(RosettaImportStatus.FAILED)
+    >>> entry.setStatus(RosettaImportStatus.FAILED, rosetta_experts)
     >>> entry = create_distro_request('ubuntu', 'grumpy')
-    >>> entry.setStatus(RosettaImportStatus.BLOCKED)
+    >>> entry.setStatus(RosettaImportStatus.BLOCKED, rosetta_experts)
     >>> entry = create_distro_request('kubuntu', 'krunch')
-    >>> entry.setStatus(RosettaImportStatus.APPROVED)
+    >>> entry.setStatus(RosettaImportStatus.APPROVED, rosetta_experts)
     >>> entry = create_product_request('evolution', 'evolution-2.2-test')
-    >>> entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> entry = create_distro_request('debian', 'woody')
-    >>> entry.setStatus(RosettaImportStatus.NEEDS_REVIEW)
+    >>> entry.setStatus(RosettaImportStatus.NEEDS_REVIEW, rosetta_experts)
     >>> flush_database_updates()
 
 TranslationImportQueue.getRequestTargets first lists distro series
@@ -1479,7 +1490,7 @@
     >>> entry = translationimportqueue.addOrUpdateEntry(
     ...     u'po/nl.po', 'hoi', True, rosetta_experts,
     ...      productseries=evolution_productseries)
-    >>> entry.setStatus(RosettaImportStatus.DELETED)
+    >>> entry.setStatus(RosettaImportStatus.DELETED, rosetta_experts)
 
 The entry stays on the queue long enough to make it a candidate for
 purging.
@@ -1507,7 +1518,7 @@
     >>> entry = translationimportqueue.addOrUpdateEntry(
     ...     u'po/nl.po', 'hoi', True, rosetta_experts,
     ...      productseries=evolution_productseries)
-    >>> entry.setStatus(RosettaImportStatus.IMPORTED)
+    >>> entry.setStatus(RosettaImportStatus.IMPORTED, rosetta_experts)
     >>> print_queue_entries(translationimportqueue)
     evolution   | None        | po/nl.po
 

=== modified file 'lib/lp/translations/interfaces/translationimportqueue.py'
--- lib/lp/translations/interfaces/translationimportqueue.py	2009-10-09 13:20:38 +0000
+++ lib/lp/translations/interfaces/translationimportqueue.py	2009-11-18 11:51:13 +0000
@@ -6,6 +6,7 @@
 from zope.interface import Interface, Attribute
 from zope.schema import (
     Bool, Choice, Datetime, Field, Int, Object, Text, TextLine)
+from zope.security.interfaces import Unauthorized
 from lazr.enum import DBEnumeratedType, DBItem, EnumeratedType, Item
 
 from canonical.launchpad import _
@@ -18,11 +19,12 @@
 
 from lazr.restful.interface import copy_field
 from lazr.restful.fields import Reference
-from lazr.restful.declarations import (
+from lazr.restful.declarations import (call_with,
     collection_default_content, exported, export_as_webservice_collection,
-    export_as_webservice_entry, export_read_operation, operation_parameters,
-    operation_returns_entry, operation_returns_collection_of)
-
+    export_as_webservice_entry, export_read_operation,
+    export_write_operation, operation_parameters,
+    operation_returns_entry, operation_returns_collection_of,
+    REQUEST_USER, webservice_error)
 from lp.translations.interfaces.translationcommonformat import (
     TranslationImportExportBaseException)
 
@@ -37,6 +39,7 @@
     'RosettaImportStatus',
     'SpecialTranslationImportTargetFilter',
     'TranslationFileType',
+    'UserCannotSetTranslationImportStatus',
     ]
 
 
@@ -46,6 +49,15 @@
     conflicts with existing entries."""
 
 
+class UserCannotSetTranslationImportStatus(Unauthorized):
+    """User not permitted to change status.
+
+    Raised when a user tries to transition to a new status who doesn't
+    have the necessary permissions.
+    """
+    webservice_error(401) # HTTP Error: 'Unauthorized'
+
+
 class RosettaImportStatus(DBEnumeratedType):
     """Rosetta Import Status
 
@@ -254,10 +266,27 @@
             required=False,
             readonly=True))
 
-    def setStatus(status):
-        """Set status.
-
-        :param status: new status to set.
+    def isUbuntuAndIsUserTranslationGroupOwner(self, user):
+        """Check for special Ubuntu Translation Group.
+
+        Return true if the entry is targeted to Ubuntu and the user is in
+        the team owning the Ubuntu translation group.
+        """
+
+    def isUserUploaderOrOwner(user):
+        """Check for entry uploader or series owner."""
+
+    def canSetStatus(new_status, user):
+        """Check if the user can set this new status."""
+
+    @call_with(user=REQUEST_USER)
+    @operation_parameters(new_status=copy_field(status))
+    @export_write_operation()
+    def setStatus(new_status, user):
+        """Transition to a new status if possible.
+
+        :param new_status: Status to transition to.
+        :param user: The user that is doing the transition.
         """
 
     def setErrorOutput(output):

=== modified file 'lib/lp/translations/model/pofile.py'
--- lib/lp/translations/model/pofile.py	2009-10-29 12:36:32 +0000
+++ lib/lp/translations/model/pofile.py	2009-11-18 11:51:13 +0000
@@ -1140,10 +1140,12 @@
             subject = 'Translation import - %s - %s' % (
                 self.language.displayname, self.potemplate.displayname)
 
+        rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
         if import_rejected:
             # There were no imports at all and the user needs to review that
             # file, we tag it as FAILED.
-            entry_to_import.setStatus(RosettaImportStatus.FAILED)
+            entry_to_import.setStatus(RosettaImportStatus.FAILED,
+                                      rosetta_experts)
         else:
             if (entry_to_import.is_published and
                 not needs_notification_for_imported):
@@ -1152,7 +1154,8 @@
                 # are needed.
                 subject = None
 
-            entry_to_import.setStatus(RosettaImportStatus.IMPORTED)
+            entry_to_import.setStatus(RosettaImportStatus.IMPORTED,
+                                      rosetta_experts)
             # Assign karma to the importer if this is not an automatic import
             # (all automatic imports come from the rosetta expert user) and
             # comes from upstream.

=== modified file 'lib/lp/translations/model/potemplate.py'
--- lib/lp/translations/model/potemplate.py	2009-11-06 21:06:38 +0000
+++ lib/lp/translations/model/potemplate.py	2009-11-18 11:51:13 +0000
@@ -891,6 +891,7 @@
 
         translation_importer = getUtility(ITranslationImporter)
 
+        rosetta_experts = getUtility(ILaunchpadCelebrities).rosetta_experts
         subject = 'Translation template import - %s' % self.displayname
         template_mail = 'poimport-template-confirmation.txt'
         errors, warnings = None, None
@@ -908,7 +909,8 @@
                 template_mail = 'poimport-bad-encoding.txt'
             else:
                 template_mail = 'poimport-syntax-error.txt'
-            entry_to_import.setStatus(RosettaImportStatus.FAILED)
+            entry_to_import.setStatus(RosettaImportStatus.FAILED,
+                                      rosetta_experts)
             error_text = str(exception)
             entry_to_import.setErrorOutput(error_text)
         else:
@@ -926,7 +928,8 @@
         entry_to_import.addWarningOutput(replacements['warnings'])
 
         if entry_to_import.status != RosettaImportStatus.FAILED:
-            entry_to_import.setStatus(RosettaImportStatus.IMPORTED)
+            entry_to_import.setStatus(RosettaImportStatus.IMPORTED,
+                                      rosetta_experts)
 
             # Assign karma to the importer if this is not an automatic import
             # (all automatic imports come from the rosetta expert team).

=== modified file 'lib/lp/translations/model/translationbranchapprover.py'
--- lib/lp/translations/model/translationbranchapprover.py	2009-10-10 19:37:03 +0000
+++ lib/lp/translations/model/translationbranchapprover.py	2009-11-18 11:51:13 +0000
@@ -11,6 +11,7 @@
 
 from zope.component import getUtility
 
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.validators.name import sanitize_name
 from lp.translations.interfaces.potemplate import IPOTemplateSet
 from lp.translations.interfaces.translationimportqueue import (
@@ -165,6 +166,7 @@
         # Approve the entry
         entry.potemplate = potemplate
         if entry.status == RosettaImportStatus.NEEDS_REVIEW:
-            entry.setStatus(RosettaImportStatus.APPROVED)
+            entry.setStatus(RosettaImportStatus.APPROVED,
+                            getUtility(ILaunchpadCelebrities).rosetta_experts)
         return entry
 

=== modified file 'lib/lp/translations/model/translationimportqueue.py'
--- lib/lp/translations/model/translationimportqueue.py	2009-10-22 07:32:02 +0000
+++ lib/lp/translations/model/translationimportqueue.py	2009-11-18 11:51:13 +0000
@@ -56,11 +56,14 @@
     ITranslationImportQueueEntry,
     RosettaImportStatus,
     SpecialTranslationImportTargetFilter,
-    TranslationImportQueueConflictError)
+    TranslationImportQueueConflictError,
+    UserCannotSetTranslationImportStatus)
 from lp.translations.interfaces.potemplate import IPOTemplate
 from lp.translations.interfaces.translations import TranslationConstants
 from lp.translations.utilities.gettext_po_importer import (
     GettextPOImporter)
+from lp.translations.utilities.permission_helpers import (
+    is_admin_or_rosetta_expert)
 from canonical.librarian.interfaces import ILibrarianClient
 
 
@@ -271,9 +274,57 @@
             distroseries=self.distroseries,
             sourcepackagename=self.sourcepackagename)
 
-    def setStatus(self, status):
-        """See `ITranslationImportQueueEntry`."""
-        self.status = status
+    def isUbuntuAndIsUserTranslationGroupOwner(self, user):
+        """See `ITranslationImportQueueEntry`."""
+        # As a special case, the Ubuntu translation group owners can
+        # manage Ubuntu uploads.
+        if self.is_targeted_to_ubuntu:
+            group = self.distroseries.distribution.translationgroup
+            if group is not None and user.inTeam(group.owner):
+                return True
+        return False
+
+    def isUserUploaderOrOwner(self, user):
+        """See `ITranslationImportQueueEntry`."""
+        if user.inTeam(self.importer):
+            return True
+        if self.productseries is not None:
+            return user.inTeam(self.productseries.product.owner)
+        if self.distroseries is not None:
+            return user.inTeam(self.distroseries.distribution.owner)
+        return False
+
+    def canSetStatus(self, new_status, user):
+        """See `ITranslationImportQueueEntry`."""
+        if new_status == self.status:
+            # Leaving status as it is is always allowed.
+            return True
+        if user is None:
+            # Anonymous user cannot do anything.
+            return False
+        can_admin = (is_admin_or_rosetta_expert(user) or
+                     self.isUbuntuAndIsUserTranslationGroupOwner(user))
+        if new_status == RosettaImportStatus.APPROVED:
+            # Only administrators are able to set the APPROVED status, and
+            # that's only possible if we know where to import it
+            # (import_into not None).
+            return can_admin and self.import_into is not None
+        if new_status == RosettaImportStatus.BLOCKED:
+            # Only administrators are able to set an entry to BLOCKED.
+            return can_admin
+        if (new_status in (RosettaImportStatus.FAILED,
+                           RosettaImportStatus.IMPORTED)):
+            # Only scripts set these statuses and they report as a rosetta
+            # expert.
+            return is_admin_or_rosetta_expert(user)
+        # All other statuses can bset set by all authorized persons.
+        return self.isUserUploaderOrOwner(user) or can_admin
+
+    def setStatus(self, new_status, user):
+        """See `ITranslationImportQueueEntry`."""
+        if not self.canSetStatus(new_status, user):
+            raise UserCannotSetTranslationImportStatus()
+        self.status = new_status
         self.date_status_changed = UTC_NOW
 
     def setErrorOutput(self, output):
@@ -473,7 +524,8 @@
         if guessed_language is None:
             # Custom language code says to ignore imports with this language
             # code.
-            self.setStatus(RosettaImportStatus.DELETED)
+            self.setStatus(RosettaImportStatus.DELETED,
+                           getUtility(ILaunchpadCelebrities).rosetta_experts)
             return None
         elif guessed_language == '':
             # We don't recognize this as a translation file with a name
@@ -877,7 +929,7 @@
                 # We got an update for this entry. If the previous import is
                 # deleted or failed or was already imported we should retry
                 # the import now, just in case it can be imported now.
-                entry.setStatus(RosettaImportStatus.NEEDS_REVIEW)
+                entry.setStatus(RosettaImportStatus.NEEDS_REVIEW, importer)
 
             entry.date_status_changed = UTC_NOW
             entry.format = format
@@ -1130,7 +1182,8 @@
 
             # Already know where it should be imported. The entry is approved
             # automatically.
-            entry.setStatus(RosettaImportStatus.APPROVED)
+            entry.setStatus(RosettaImportStatus.APPROVED,
+                            getUtility(ILaunchpadCelebrities).rosetta_experts)
 
             if txn is not None:
                 txn.commit()
@@ -1165,7 +1218,9 @@
             if has_templates and not has_templates_unblocked:
                 # All templates on the same directory as this entry are
                 # blocked, so we can block it too.
-                entry.setStatus(RosettaImportStatus.BLOCKED)
+                entry.setStatus(
+                    RosettaImportStatus.BLOCKED,
+                    getUtility(ILaunchpadCelebrities).rosetta_experts)
                 num_blocked += 1
                 if txn is not None:
                     txn.commit()

=== modified file 'lib/lp/translations/scripts/po_import.py'
--- lib/lp/translations/scripts/po_import.py	2009-10-20 05:17:01 +0000
+++ lib/lp/translations/scripts/po_import.py	2009-11-18 11:51:13 +0000
@@ -73,7 +73,8 @@
     def _registerFailure(self, entry, reason, traceback=False, abort=False):
         """Note that a queue entry is unusable in some way."""
         reason_text = unicode(reason)
-        entry.setStatus(RosettaImportStatus.FAILED)
+        entry.setStatus(RosettaImportStatus.FAILED,
+                        getUtility(ILaunchpadCelebrities).rosetta_experts)
         entry.setErrorOutput(reason_text)
 
         if abort:

=== modified file 'lib/lp/translations/stories/webservice/xx-translationimportqueue.txt'
--- lib/lp/translations/stories/webservice/xx-translationimportqueue.txt	2009-07-01 20:45:39 +0000
+++ lib/lp/translations/stories/webservice/xx-translationimportqueue.txt	2009-11-18 11:51:13 +0000
@@ -114,8 +114,23 @@
     ...
     status: You tried to modify a read-only attribute.
 
-An attempt to do so will leave the entry's status unchanged.
+But you can set the status using the setStatus method.
+
+    >>> print webservice.named_post(
+    ...     first_entry, 'setStatus', {}, new_status='Approved')
+    HTTP/1.1 200 Ok
+    ...
+
+The entry's status is changed.
 
     >>> queue = webservice.get("/+imports").jsonBody()
     >>> print queue['entries'][0]['status']
-    Imported
+    Approved
+
+Unprivileged users cannot change the status.
+
+    >>> print user_webservice.named_post(
+    ...     first_entry, 'setStatus', {}, new_status='Deleted')
+    HTTP/1.1 401 Unauthorized
+    ...
+

=== modified file 'lib/lp/translations/tests/test_autoapproval.py'
--- lib/lp/translations/tests/test_autoapproval.py	2009-10-29 17:46:00 +0000
+++ lib/lp/translations/tests/test_autoapproval.py	2009-11-18 11:51:13 +0000
@@ -13,6 +13,9 @@
 import transaction
 import unittest
 
+from zope.component import getUtility
+
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.lpstorm import IMasterStore
 
 from lp.registry.interfaces.distroseries import DistroSeriesStatus
@@ -749,7 +752,8 @@
 
     def _setStatus(self, entry, status, when=None):
         """Simulate status on queue entry having been set at a given time."""
-        entry.setStatus(status)
+        entry.setStatus(status,
+                        getUtility(ILaunchpadCelebrities).rosetta_experts)
         if when is not None:
             entry.date_status_changed = when
         entry.syncUpdate()
@@ -760,6 +764,8 @@
         # are.
         one_year_ago = datetime.now(UTC) - timedelta(days=366)
         entry = self._makeProductEntry()
+        entry.potemplate = (
+            self.factory.makePOTemplate(productseries=entry.productseries))
         entry_id = entry.id
 
         self._setStatus(entry, RosettaImportStatus.APPROVED, one_year_ago)

=== modified file 'lib/lp/translations/tests/test_translationbranchapprover.py'
--- lib/lp/translations/tests/test_translationbranchapprover.py	2009-10-19 10:57:28 +0000
+++ lib/lp/translations/tests/test_translationbranchapprover.py	2009-11-18 11:51:13 +0000
@@ -8,6 +8,7 @@
 from unittest import TestLoader
 from zope.component import getUtility
 
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.validators.name import valid_name
 from canonical.testing import LaunchpadZopelessLayer
 from lp.translations.interfaces.translationimportqueue import (
@@ -213,7 +214,8 @@
             RosettaImportStatus.BLOCKED,
             )
         for status in not_approve_status:
-            entry.setStatus(status)
+            entry.setStatus(
+                status, getUtility(ILaunchpadCelebrities).rosetta_experts)
             approver = self._create_approver(pot_path)
             approver.approve(entry)
             self.assertEqual(status, entry.status)

=== added file 'lib/lp/translations/tests/test_translationimportqueue.py'
--- lib/lp/translations/tests/test_translationimportqueue.py	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/tests/test_translationimportqueue.py	2009-11-18 11:51:13 +0000
@@ -0,0 +1,125 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=C0102
+
+__metaclass__ = type
+
+import unittest
+
+from zope.component import getUtility
+
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+from lp.translations.interfaces.translationimportqueue import (
+    ITranslationImportQueue, RosettaImportStatus)
+
+from lp.testing import TestCaseWithFactory
+from canonical.testing import LaunchpadZopelessLayer
+
+
+class TestTranslationImportQueueEntryStatus(TestCaseWithFactory):
+    """Test handling of the status of a queue entry."""
+
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        """Set up context to test in."""
+        super(TestTranslationImportQueueEntryStatus, self).setUp()
+
+        self.queue = getUtility(ITranslationImportQueue)
+        self.rosetta_experts = (
+            getUtility(ILaunchpadCelebrities).rosetta_experts)
+        self.productseries = self.factory.makeProductSeries()
+        self.uploaderperson = self.factory.makePerson()
+        self.potemplate = self.factory.makePOTemplate(
+            productseries=self.productseries)
+        self.entry = self.queue.addOrUpdateEntry(
+            'demo.pot', '#demo', False, self.uploaderperson,
+            productseries=self.productseries, potemplate=self.potemplate)
+
+    def _assertCanSetStatus(self, user, entry, expected_list):
+        # Helper to check for all statuses.
+        # Could iterate RosettaImportStatus.items but listing them here
+        # explicitely is better to read. They are sorted alphabetically.
+        possible_statuses = [
+            RosettaImportStatus.APPROVED,
+            RosettaImportStatus.BLOCKED,
+            RosettaImportStatus.DELETED,
+            RosettaImportStatus.FAILED,
+            RosettaImportStatus.IMPORTED,
+            RosettaImportStatus.NEEDS_REVIEW,
+        ]
+        # Do *not* use assertContentEqual here, as the order matters.
+        self.assertEqual(expected_list,
+            [entry.canSetStatus(status, user)
+                 for status in possible_statuses])
+
+    def test_canSetStatus_non_admin(self):
+        # A non-privileged users cannot set any status except for retaining
+        # the current status of an entry.
+        some_user = self.factory.makePerson()
+        self._assertCanSetStatus(some_user, self.entry,
+            #  A      B      D      F      I     NR
+            [False, False, False, False, False, True])
+        self.entry.setStatus(
+            RosettaImportStatus.DELETED, self.rosetta_experts)
+        self._assertCanSetStatus(some_user, self.entry,
+            #  A      B      D     F      I     NR
+            [False, False, True, False, False, False])
+
+    def test_canSetStatus_rosetta_expert(self):
+        # Rosetta experts are all-powerful, didn't you know that?
+        self._assertCanSetStatus(self.rosetta_experts, self.entry,
+            #  A     B     D     F     I    NR
+            [True, True, True, True, True, True])
+
+    def test_canSetStatus_rosetta_expert_no_target(self):
+        # If the entry has no import target set, even Rosetta experts
+        # cannot set it to approved.
+        self.entry.potemplate = None
+        self._assertCanSetStatus(self.rosetta_experts, self.entry,
+            #  A      B     D     F     I    NR
+            [False, True, True, True, True, True])
+
+    def test_canSetStatus_uploader(self):
+        # The uploader can set some statuses.
+        self._assertCanSetStatus(self.uploaderperson, self.entry,
+            #  A      B     D     F      I     NR
+            [False, False, True, False, False, True])
+
+    def test_canSetStatus_owner(self):
+        # The owner gets the same permissions.
+        self._assertCanSetStatus(self.productseries.product.owner, self.entry,
+            #  A      B     D     F      I     NR
+            [False, False, True, False, False, True])
+
+    def _setUpUbuntu(self):
+        self.ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+        self.ubuntu_group_owner = self.factory.makePerson()
+        self.ubuntu.translationgroup = (
+            self.factory.makeTranslationGroup(self.ubuntu_group_owner))
+
+    def test_canSetStatus_ubuntu_translation_group(self):
+        # Owners of the Ubuntu translation Groups can set entries to approved
+        # that are targeted to Ubuntu.
+        self._setUpUbuntu()
+        ubuntu_entry = self.queue.addOrUpdateEntry(
+            'demo.pot', '#demo', False, self.uploaderperson,
+            distroseries=self.factory.makeDistroRelease(self.ubuntu),
+            sourcepackagename=self.factory.makeSourcePackageName(),
+            potemplate=self.potemplate)
+        self._assertCanSetStatus(self.ubuntu_group_owner, ubuntu_entry,
+            #  A     B     D     F      I     NR
+            [True, True, True, False, False, True])
+
+    def test_canSetStatus_ubuntu_translation_group_not_ubuntu(self):
+        # Outside of Ubuntu, owners of the Ubuntu translation Groups have no
+        # powers.
+        self._setUpUbuntu()
+        self._assertCanSetStatus(self.ubuntu_group_owner, self.entry,
+            #  A      B      D      F      I     NR
+            [False, False, False, False, False, True])
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)

=== added file 'lib/lp/translations/utilities/permission_helpers.py'
--- lib/lp/translations/utilities/permission_helpers.py	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/utilities/permission_helpers.py	2009-11-18 11:51:13 +0000
@@ -0,0 +1,21 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Helpful functions to enforce permissions."""
+
+__metaclass__ = type
+
+__all__ = [
+    'is_admin_or_rosetta_expert',
+    ]
+
+from zope.component import getUtility
+
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+
+
+def is_admin_or_rosetta_expert(user):
+    """Check if the user is a Launchpad admin or a Rosettta expert."""
+    celebrities = getUtility(ILaunchpadCelebrities)
+    return (user.inTeam(celebrities.admin) or
+            user.inTeam(celebrities.rosetta_experts))

=== modified file 'lib/lp/translations/utilities/tests/helpers.py'
--- lib/lp/translations/utilities/tests/helpers.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/utilities/tests/helpers.py	2009-11-18 11:51:13 +0000
@@ -15,6 +15,7 @@
 
 from zope.component import getUtility
 
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.translations.interfaces.translationimportqueue import (
     ITranslationImportQueue, RosettaImportStatus)
 from canonical.launchpad.scripts import FakeLogger
@@ -64,7 +65,8 @@
     else:
         commit()
 
-    entry.setStatus(RosettaImportStatus.APPROVED)
+    entry.setStatus(RosettaImportStatus.APPROVED,
+                    getUtility(ILaunchpadCelebrities).rosetta_experts)
     (subject, body) = target.importFromQueue(entry, FakeLogger())
     return entry
 

=== modified file 'lib/lp/translations/utilities/tests/test_xpi_import.py'
--- lib/lp/translations/utilities/tests/test_xpi_import.py	2009-08-13 15:12:16 +0000
+++ lib/lp/translations/utilities/tests/test_xpi_import.py	2009-11-18 11:51:13 +0000
@@ -9,6 +9,7 @@
 
 from zope.component import getUtility
 
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.product import IProductSet
 from lp.translations.interfaces.potemplate import IPOTemplateSet
@@ -204,7 +205,8 @@
             ).count()
 
         # Force the entry to be imported again:
-        entry.setStatus(RosettaImportStatus.APPROVED)
+        entry.setStatus(RosettaImportStatus.APPROVED,
+                        getUtility(ILaunchpadCelebrities).rosetta_experts)
         # Now, we tell the PO template to import from the file data it has.
         (subject, body) = self.firefox_template.importFromQueue(entry)
 

=== modified file 'lib/lp/translations/utilities/tests/test_xpi_po_exporter.py'
--- lib/lp/translations/utilities/tests/test_xpi_po_exporter.py	2009-08-13 15:12:16 +0000
+++ lib/lp/translations/utilities/tests/test_xpi_po_exporter.py	2009-11-18 11:51:13 +0000
@@ -10,6 +10,7 @@
 
 from canonical.database.sqlbase import commit
 from canonical.launchpad.ftests import sync
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.product import IProductSet
 from lp.translations.interfaces.potemplate import IPOTemplateSet
@@ -78,7 +79,8 @@
             potemplate=self.firefox_template)
 
         # We must approve the entry to be able to import it.
-        entry.setStatus(RosettaImportStatus.APPROVED)
+        entry.setStatus(RosettaImportStatus.APPROVED,
+                        getUtility(ILaunchpadCelebrities).rosetta_experts)
         # The file data is stored in the Librarian, so we have to commit the
         # transaction to make sure it's stored properly.
         commit()