[Checkins] SVN: zope.app.i18n/trunk/ merge bugfix changes from 3.4.4 release

[Fred L. Drake, Jr.]

Log message for revision 81018:
  merge bugfix changes from 3.4.4 release

Changed:
  U   zope.app.i18n/trunk/CHANGES.txt
  U   zope.app.i18n/trunk/buildout.cfg
  U   zope.app.i18n/trunk/src/zope/app/i18n/browser/synchronize.py
  U   zope.app.i18n/trunk/src/zope/app/i18n/browser/tests/test_translate.py

-=-
Modified: zope.app.i18n/trunk/CHANGES.txt
===================================================================
--- zope.app.i18n/trunk/CHANGES.txt	2007-10-24 02:35:49 UTC (rev 81017)
+++ zope.app.i18n/trunk/CHANGES.txt	2007-10-24 02:37:33 UTC (rev 81018)
@@ -2,6 +2,17 @@
 CHANGES
 =======
 
+Version 3.4.4 (2007/10/23)
+--------------------------
+
+- Fix deprecation warning.
+
+Version 3.4.3 (2007/10/23)
+--------------------------
+
+- Fix imports in tests.
+- Clean up long lines.
+
 Version 3.4.2 (2007/9/26)
 -------------------------
 

Modified: zope.app.i18n/trunk/buildout.cfg
===================================================================
--- zope.app.i18n/trunk/buildout.cfg	2007-10-24 02:35:49 UTC (rev 81017)
+++ zope.app.i18n/trunk/buildout.cfg	2007-10-24 02:37:33 UTC (rev 81018)
@@ -6,6 +6,3 @@
 [test]
 recipe = zc.recipe.testrunner
 eggs = zope.app.i18n [test]
-
-
-

Modified: zope.app.i18n/trunk/src/zope/app/i18n/browser/synchronize.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/browser/synchronize.py	2007-10-24 02:35:49 UTC (rev 81017)
+++ zope.app.i18n/trunk/src/zope/app/i18n/browser/synchronize.py	2007-10-24 02:37:33 UTC (rev 81018)
@@ -22,11 +22,14 @@
 import xmlrpclib
 from base64 import encodestring
 
+import zope.i18nmessageid
+
 from zope.security.proxy import removeSecurityProxy
 
 from zope.app.i18n.browser import BaseView
-from zope.app.i18n import ZopeMessageFactory as _
 
+_ = zope.i18nmessageid.MessageFactory("zope")
+
 DEFAULT = 'http://localhost:8080/++etc++site/default/zope'
 
 class Synchronize(BaseView):

Modified: zope.app.i18n/trunk/src/zope/app/i18n/browser/tests/test_translate.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/browser/tests/test_translate.py	2007-10-24 02:35:49 UTC (rev 81017)
+++ zope.app.i18n/trunk/src/zope/app/i18n/browser/tests/test_translate.py	2007-10-24 02:37:33 UTC (rev 81018)
@@ -107,10 +107,21 @@
         self.assert_('es' not in self._view.getAllLanguages())
 
 
+class SynchronizeTest(unittest.TestCase):
 
+    def test_synchronize_imports(self):
+        # Trivial test that imports the module.  This would have triggered a
+        # deprecation warning in previous versions.
+        import zope.app.i18n.browser.synchronize
+
+
 def test_suite():
     loader = unittest.TestLoader()
-    return loader.loadTestsFromTestCase(TranslateTest)
+    return unittest.TestSuite([
+        loader.loadTestsFromTestCase(TranslateTest),
+        loader.loadTestsFromTestCase(SynchronizeTest),
+        ])
+    return 
 
 if __name__=='__main__':
     unittest.main()