[Checkins] SVN: zope.app.i18n/trunk/ Import queryNextUtility directly from zope.component.

[Dan Korostelev]

Log message for revision 98227:
  Import queryNextUtility directly from zope.component.

Changed:
  U   zope.app.i18n/trunk/CHANGES.txt
  U   zope.app.i18n/trunk/setup.py
  U   zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py

-=-
Modified: zope.app.i18n/trunk/CHANGES.txt
===================================================================
--- zope.app.i18n/trunk/CHANGES.txt	2009-03-18 12:49:21 UTC (rev 98226)
+++ zope.app.i18n/trunk/CHANGES.txt	2009-03-18 12:51:22 UTC (rev 98227)
@@ -17,6 +17,9 @@
    * The IUserPreferredCharsets adapter registration was also moved into
      ``zope.publisher``.
 
+- Depend on zope.component >= 3.6 instead of zope.app.component as the
+  `queryNextUtility` function was moved there. 
+
 3.5.0 (2009-02-01)
 ------------------
 

Modified: zope.app.i18n/trunk/setup.py
===================================================================
--- zope.app.i18n/trunk/setup.py	2009-03-18 12:49:21 UTC (rev 98226)
+++ zope.app.i18n/trunk/setup.py	2009-03-18 12:51:22 UTC (rev 98227)
@@ -51,9 +51,8 @@
     namespace_packages=['zope', 'zope.app'],
     extras_require = dict(test=['zope.app.testing']),
     install_requires=['setuptools',
-                      'zope.app.component',
                       'zope.app.publisher',
-                      'zope.component',
+                      'zope.component>=3.6',
                       'zope.container',
                       'zope.configuration',
                       'zope.i18n',

Modified: zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py	2009-03-18 12:49:21 UTC (rev 98226)
+++ zope.app.i18n/trunk/src/zope/app/i18n/translationdomain.py	2009-03-18 12:51:22 UTC (rev 98227)
@@ -30,7 +30,6 @@
 from zope.container.btree import BTreeContainer
 from zope.container.contained import Contained
 from zope.app.i18n.interfaces import ILocalTranslationDomain
-from zope.app.component import queryNextUtility
 
 
 class TranslationDomain(BTreeContainer, SimpleTranslationDomain, Contained):
@@ -82,7 +81,8 @@
         else:
             # If nothing found, delegate to a translation server higher up the
             # tree.
-            domain = queryNextUtility(self, ITranslationDomain, self.domain)
+            domain = zope.component.queryNextUtility(self, ITranslationDomain,
+                                                     self.domain)
             if domain is not None:
                 return domain.translate(msgid, mapping, context,
                                         target_language, default=default)