[Checkins] SVN: zope.app.i18n/trunk/ Do not use zope.deferredimport

[Gediminas Paulauskas]

Log message for revision 115382:
  Do not use zope.deferredimport
  

Changed:
  U   zope.app.i18n/trunk/CHANGES.txt
  U   zope.app.i18n/trunk/src/zope/app/i18n/__init__.py
  U   zope.app.i18n/trunk/src/zope/app/i18n/tests/__init__.py

-=-
Modified: zope.app.i18n/trunk/CHANGES.txt
===================================================================
--- zope.app.i18n/trunk/CHANGES.txt	2010-08-02 19:04:55 UTC (rev 115381)
+++ zope.app.i18n/trunk/CHANGES.txt	2010-08-02 19:06:42 UTC (rev 115382)
@@ -5,9 +5,8 @@
 3.6.3 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Remove undeclared dependency on zope.deferredimport.
 
-
 3.6.2 (2009-10-07)
 ------------------
 

Modified: zope.app.i18n/trunk/src/zope/app/i18n/__init__.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/__init__.py	2010-08-02 19:04:55 UTC (rev 115381)
+++ zope.app.i18n/trunk/src/zope/app/i18n/__init__.py	2010-08-02 19:06:42 UTC (rev 115382)
@@ -12,16 +12,7 @@
 #
 ##############################################################################
 """Customization of zope.i18n for the Zope application server
-
-$Id$
 """
-__docformat__ = 'restructuredtext'
 
-import zope.deferredimport
-
-
-zope.deferredimport.deprecated(
-    "It has moved to zope.i18nmessageid  This reference will be gone "
-    "in Zope 3.6",
-    ZopeMessageFactory = 'zope.i18nmessageid:ZopeMessageFactory',
-    )
+# BBB
+from zope.i18nmessageid import ZopeMessageFactory

Modified: zope.app.i18n/trunk/src/zope/app/i18n/tests/__init__.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/tests/__init__.py	2010-08-02 19:04:55 UTC (rev 115381)
+++ zope.app.i18n/trunk/src/zope/app/i18n/tests/__init__.py	2010-08-02 19:06:42 UTC (rev 115382)
@@ -1,9 +1 @@
 # This file is necessary to make this directory a package.
-
-# BBB 2006/04/19 -- to be removed after 12 months
-import zope.deferredimport
-zope.deferredimport.deprecated(
-    "Its contents has moved into zope.i18n.testing.  This reference "
-    "will be gone in Zope 3.5",
-    placelesssetup = 'zope.i18n.testing',
-    )