addressed Don\'s comments on pull request

i18n/generate.py

@@ -21,7 +21,7 @@ def merge(locale, target='django.po'):
     """
     For the given locale, merge django-partial.po, messages.po, mako.po -> django.po
     """
-    LOG.info('Merging locale=%s' % locale)
+    LOG.info('Merging locale={0}'.format(locale))
     locale_directory = messages_dir(locale)
     files_to_merge = ('django-partial.po', 'messages.po', 'mako.po')
     validate_files(locale_directory, files_to_merge)
@@ -45,7 +45,7 @@ def validate_files(dir, files_to_merge):
     for path in files_to_merge:
         pathname = os.path.join(dir, path)
         if not os.path.exists(pathname):
-            raise Exception("File not found: %s" % pathname)
+            raise Exception("File not found: {0}".format(pathname))
 
 def main ():
     configuration = get_config()

i18n/test/test_extract.py

@@ -22,15 +22,9 @@ class TestExtract(TestCase):
         self.start_time = datetime.now() - timedelta(seconds=1)
         super(TestExtract, self).setUp()
         if not SETUP_HAS_RUN:
-            self.run_main()
-            SETUP_HAS_RUN = True
-
-    def run_main(self):
             # Run extraction script. Warning, this takes 1 minute or more
-        print "***********************"
-        print "***********************"
-        print "***********************"
             extract.main()
+            SETUP_HAS_RUN = True
 
     def get_files (self):
         """