Merge lp:~jtv/launchpad/bug-503769 into lp:launchpad

[Jeroen T. Vermeulen]

Fix Translations import policy violations.

[Jeroen T. Vermeulen (jtv)]

= Bug 503769 =

When running ./bin/test, even with a pattern that matches zero tests, we now get a long list of import policy violations throughout the codebase. A few are related to Translations code; this branch fixes those.

No lint. To test, try
{{{
./bin/test -vv -t a-test-that-does-not-exist
}}}

This will still warn about policy violations, but several will be gone:
{{{
You should not import ITranslationImportQueue from lp.translations.model.translationimportqueue:
    lp.registry.model.product
You should not import UTC from pytz:
    lp.translations.scripts.po_import
    lp.translations.scripts.translations_to_branch
}}}

(Look for these very near the end of the list of warnings).

Jeroen

[Abel Deuring (adeuring)]

Thanks for fixing this!

review: Approve (code)

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/model/product.py	2010-01-07 13:58:19 +0000
@@ -69,8 +69,10 @@
 from lp.blueprints.model.specification import (
     HasSpecificationsMixin, Specification)
 from lp.blueprints.model.sprint import HasSprintsMixin
+from lp.translations.interfaces.translationimportqueue import (
+    ITranslationImportQueue)
 from lp.translations.model.translationimportqueue import (
-    HasTranslationImportsMixin, ITranslationImportQueue)
+    HasTranslationImportsMixin)
 from lp.registry.model.structuralsubscription import (
     StructuralSubscriptionTargetMixin)
 from canonical.launchpad.helpers import shortlist

=== modified file 'lib/lp/translations/scripts/po_import.py'
--- lib/lp/translations/scripts/po_import.py	2010-01-05 16:07:31 +0000
+++ lib/lp/translations/scripts/po_import.py	2010-01-07 13:58:19 +0000
@@ -13,7 +13,7 @@
 from datetime import datetime, timedelta
 import sys
 
-from pytz import UTC
+from pytz import timezone
 from zope.component import getUtility
 
 from canonical.config import config
@@ -143,6 +143,8 @@
         """Import entries from the queue."""
         self.logger.debug("Starting the import process.")
 
+        UTC = timezone('UTC')
+
         self.deadline = datetime.now(UTC) + self.time_to_run
         translation_import_queue = getUtility(ITranslationImportQueue)
 

=== modified file 'lib/lp/translations/scripts/translations_to_branch.py'
--- lib/lp/translations/scripts/translations_to_branch.py	2009-11-18 14:39:48 +0000
+++ lib/lp/translations/scripts/translations_to_branch.py	2010-01-07 13:58:19 +0000
@@ -9,7 +9,7 @@
 
 import os.path
 from datetime import datetime, timedelta
-from pytz import UTC
+from pytz import timezone
 
 from zope.component import getUtility
 
@@ -27,6 +27,9 @@
 from lp.services.scripts.base import LaunchpadCronScript
 
 
+UTC = timezone('UTC')
+
+
 class ExportTranslationsToBranch(LaunchpadCronScript):
     """Commit translations to translations_branches where requested."""