- adjust dependencies, reflect changes in zope packages

- clanup tests, remove unused tests and skip using zope.app.testing

CHANGES.txt

@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+1.1.0 (2009-11-29)
+------------------
+
+- adjust dependencies, reflect changes in zope packages
+
+- clanup tests, remove unused tests and skip using zope.app.testing
+
+
 1.0.1 (2008-01-24)
 ------------------
 

setup.py

@@ -23,7 +23,7 @@ def read(*rnames):
 
 setup (
     name='z3c.language.negotiator',
-    version='1.0.2dev',
+    version='1.1.0',
     author = "Roger Ineichen and the Zope Community",
     author_email = "zope-dev@zope.org",
     description = "Zope3 i18n language negotiator.",
@@ -56,26 +56,22 @@ def read(*rnames):
     namespace_packages = ['z3c', 'z3c.language'],
     extras_require = dict(
         test = [
-            'zope.app.testing',
-            'zope.testing',
             'z3c.testing',
             'z3c.coverage',
+            'zope.testing',
             ],
         ),
     install_requires = [
         'setuptools',
-        'z3c.i18n',
         'z3c.language.session',
-        'zope.app.component',
-        'zope.app.container',
         'zope.app.generations',
-        'zope.app.zopeappgenerations',
         'zope.component',
+        'zope.container',
         'zope.i18n',
+        'zope.i18nmessageid',
         'zope.interface',
         'zope.publisher',
         'zope.schema',
-        'zope.session',
         ],
     zip_safe = False,
     )

src/z3c/language/negotiator/README.txt

@@ -42,18 +42,12 @@ If we set a policy with a wrong value, we will get a ValueError:
   ...
   ValueError: ('Not a valid policy name.', u'wrong')
 
-Let's add the negotiator to the site root:
-
-  >>> rootFolder['negotiator'] = negotiator
-
-And register the negotiator as a utility:
+Register the negotiator as a global utility:
 
   >>> import zope.component
-  >>> sitemanager = zope.component.getSiteManager(rootFolder)
-  >>> sitemanager.registerUtility(negotiator, INegotiator)
+  >>> zope.component.provideUtility(negotiator, INegotiator)
 
-After register the negotiator as a utility, we can use the vocabulary and see
-what offered languages are available:
+Now we can use the vocabulary and see what offered languages are available:
 
   >>> from z3c.language.negotiator import vocabulary
   >>> vocab = vocabulary.OfferedLanguagesVocabulary(None)

src/z3c/language/negotiator/app.py

@@ -20,13 +20,11 @@
 import persistent
 import zope.interface
 
+from zope.container import contained
 from zope.schema.fieldproperty import FieldProperty
-from zope.i18n.interfaces import IUserPreferredLanguages
 from zope.i18n.interfaces import INegotiator
 from zope.i18n.negotiator import negotiator
 
-from zope.app.container import contained
-
 from z3c.language.session.interfaces import ILanguageSession
 
 from z3c.language.negotiator.interfaces import INegotiatorManager

src/z3c/language/negotiator/generations/evolve1.py

@@ -17,10 +17,10 @@
 __docformat__ = "reStructuredText"
 
 import zope.component
+from zope.component.interfaces import ISite
 from zope.i18n.interfaces import INegotiator
 from zope.app.generations.utility import findObjectsProviding
-from zope.app.zopeappgenerations import getRootFolder
-from zope.app.component.interfaces import ISite
+from zope.app.generations.utility import getRootFolder
 
 from z3c.language.negotiator import interfaces
 

src/z3c/language/negotiator/interfaces.py

@@ -18,11 +18,11 @@
 __docformat__ = 'restructuredtext'
 
 import zope.interface
+import zope.i18nmessageid
 import zope.schema
 from zope.schema.interfaces import IVocabularyTokenized
-from zope.session.interfaces import ISession
-from zope.i18n.interfaces import INegotiator
-from z3c.i18n import MessageFactory as _
+
+_ = zope.i18nmessageid.MessageFactory('z3c')
 
 
 language_policies = ['server', 'session', 'browser', 

src/z3c/language/negotiator/testing.py

@@ -19,20 +19,11 @@
 
 import zope.interface
 import zope.component
-from zope.schema import vocabulary
 from zope.i18n.interfaces import IUserPreferredLanguages
-from zope.publisher.interfaces import IRequest
-from zope.session.interfaces import IClientId
-from zope.session.interfaces import IClientIdManager
-from zope.session.interfaces import ISessionDataContainer
-from zope.session.http import CookieClientIdManager
-from zope.session import session
-
-from z3c import testing
+from zope.i18n.interfaces import INegotiator
+
+import z3c.testing
 from z3c.language.session.interfaces import ILanguageSession
-from z3c.language.session.app import LanguageSession
-from z3c.language.negotiator import interfaces
-from z3c.language.negotiator.vocabulary import OfferedLanguagesVocabulary
 
 
 ###############################################################################
@@ -41,12 +32,6 @@
 #
 ###############################################################################
 
-class TestClientId(object):
-    zope.interface.implements(IClientId)
-    def __new__(cls, request):
-        return 'dummyclientidfortesting'
-
-
 class LanguageSessionStub(object):
 
     zope.interface.implements(ILanguageSession)
@@ -69,46 +54,14 @@ def getPreferredLanguages(self):
         return self.langs
 
 
-###############################################################################
-#
-# placeful setup
-#
-###############################################################################
-
-from zope.app.testing import setup
-
-def doctestSetUp(test):
-    site = setup.placefulSetUp(site=True)
-    test.globs['rootFolder'] = site
-
-    # session setup
-    zope.component.provideAdapter(TestClientId, (IRequest,), IClientId)
-    zope.component.provideAdapter(LanguageSession, (IRequest,), 
-        ILanguageSession)
-    zope.component.provideUtility(CookieClientIdManager(), IClientIdManager)
-    rsdc = session.RAMSessionDataContainer()
-    zope.component.provideUtility(rsdc, ISessionDataContainer, '')
-
-    # register vocabularies
-    vocabulary.setVocabularyRegistry(None)
-    vocabulary._clear()
-    vr = vocabulary.getVocabularyRegistry()
-
-    vr.register('Offered Languages', OfferedLanguagesVocabulary)
-
-def doctestTearDown(test):
-    setup.placefulTearDown()
-    vocabulary._clear()
-
-
 ###############################################################################
 #
 # Public base tests
 #
 ###############################################################################
 
-class BaseTestINegotiator(testing.InterfaceBaseTest):
+class BaseTestINegotiator(z3c.testing.InterfaceBaseTest):
     """Resuable INegotiator base test."""
 
     def getTestInterface(self):
-        return interfaces.INegotiator
+        return INegotiator

src/z3c/language/negotiator/tests.py

@@ -82,8 +82,6 @@ def test_suite():
         unittest.makeSuite(NegotiatorBaseTest),
         unittest.makeSuite(NegotiatorTest),
         DocFileSuite('README.txt',
-            setUp=testing.doctestSetUp,
-            tearDown=testing.doctestTearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
         ))
 

src/z3c/language/negotiator/vocabulary.py

@@ -19,7 +19,7 @@
 
 import zope.interface
 import zope.component
-from zope.schema.interfaces import IVocabularyFactory
+from zope.i18n.interfaces import INegotiator
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
 
@@ -35,7 +35,7 @@ def __init__(self, context):
         terms = []
 
         # collect offered languages
-        negotiator = zope.component.getUtility(interfaces.INegotiator)
+        negotiator = zope.component.getUtility(INegotiator)
         languages = negotiator.offeredLanguages
 
         for lang in languages: