[Checkins] SVN: z3c.language.negotiator/trunk/ - adjust dependencies, reflect changes in zope packages
Roger Ineichen
roger at projekt01.ch
Sat Nov 28 23:51:14 EST 2009
Log message for revision 106095:
- adjust dependencies, reflect changes in zope packages
- clanup tests, remove unused tests and skip using zope.app.testing
Changed:
U z3c.language.negotiator/trunk/CHANGES.txt
U z3c.language.negotiator/trunk/setup.py
U z3c.language.negotiator/trunk/src/z3c/language/negotiator/README.txt
U z3c.language.negotiator/trunk/src/z3c/language/negotiator/app.py
D z3c.language.negotiator/trunk/src/z3c/language/negotiator/browser.txt
D z3c.language.negotiator/trunk/src/z3c/language/negotiator/ftests.py
U z3c.language.negotiator/trunk/src/z3c/language/negotiator/generations/evolve1.py
U z3c.language.negotiator/trunk/src/z3c/language/negotiator/interfaces.py
U z3c.language.negotiator/trunk/src/z3c/language/negotiator/testing.py
U z3c.language.negotiator/trunk/src/z3c/language/negotiator/tests.py
U z3c.language.negotiator/trunk/src/z3c/language/negotiator/vocabulary.py
-=-
Modified: z3c.language.negotiator/trunk/CHANGES.txt
===================================================================
--- z3c.language.negotiator/trunk/CHANGES.txt 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/CHANGES.txt 2009-11-29 04:51:14 UTC (rev 106095)
@@ -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)
------------------
Modified: z3c.language.negotiator/trunk/setup.py
===================================================================
--- z3c.language.negotiator/trunk/setup.py 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/setup.py 2009-11-29 04:51:14 UTC (rev 106095)
@@ -23,7 +23,7 @@
setup (
name='z3c.language.negotiator',
- version='1.0.2dev',
+ version='1.1.0',
author = "Roger Ineichen and the Zope Community",
author_email = "zope-dev at zope.org",
description = "Zope3 i18n language negotiator.",
@@ -56,26 +56,22 @@
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,
)
Modified: z3c.language.negotiator/trunk/src/z3c/language/negotiator/README.txt
===================================================================
--- z3c.language.negotiator/trunk/src/z3c/language/negotiator/README.txt 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/src/z3c/language/negotiator/README.txt 2009-11-29 04:51:14 UTC (rev 106095)
@@ -42,18 +42,12 @@
...
ValueError: ('Not a valid policy name.', u'wrong')
-Let's add the negotiator to the site root:
+Register the negotiator as a global utility:
- >>> rootFolder['negotiator'] = negotiator
-
-And register the negotiator as a 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)
Modified: z3c.language.negotiator/trunk/src/z3c/language/negotiator/app.py
===================================================================
--- z3c.language.negotiator/trunk/src/z3c/language/negotiator/app.py 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/src/z3c/language/negotiator/app.py 2009-11-29 04:51:14 UTC (rev 106095)
@@ -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
Deleted: z3c.language.negotiator/trunk/src/z3c/language/negotiator/browser.txt
===================================================================
--- z3c.language.negotiator/trunk/src/z3c/language/negotiator/browser.txt 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/src/z3c/language/negotiator/browser.txt 2009-11-29 04:51:14 UTC (rev 106095)
@@ -1,72 +0,0 @@
-==========
-Negotiator
-==========
-
-Setup testbrowser for Negotiator functional tests.
-
- >>> from zope.testbrowser.testing import Browser
- >>> browser = Browser()
- >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
- >>> browser.handleErrors = False
-
-Start Zope3 an go to the root.
-
- >>> browser.open('http://localhost/@@contents.html')
- >>> browser.url
- 'http://localhost/@@contents.html'
-
-Add a negotiator.
-
- >>> browser.open('http://localhost/++etc++site/default/@@contents.html?type_name=BrowserAdd__z3c.language.negotiator.app.Negotiator')
- >>> browser.url
- 'http://localhost/++etc++site/default/@@contents.html?type_name=BrowserAdd__z3c.language.negotiator.app.Negotiator'
- >>> browser.getControl(name='new_value').value = ''
- >>> browser.getControl('Apply').click()
- >>> browser.url
- 'http://localhost/++etc++site/default/Negotiator/@@registration.html'
-
-And register the added negotiator utility.
-
- >>> browser.handleErrors = False
- >>> "This object isn't yet registered." in browser.contents
- True
- >>> browser.getLink('Registration').click()
- >>> browser.getControl('Register this object').click()
- >>> browser.url
- 'http://localhost/++etc++site/default/Negotiator/@@addRegistration.html'
- >>> browser.getControl(
- ... 'Provided interface').value = ['zope.i18n.interfaces.INegotiator']
- >>> browser.getControl('Register As').value = ''
- >>> browser.getControl('Comment').value = 'A local negotiator'
- >>> browser.getControl('Register', index=1).click()
- >>> browser.url
- 'http://localhost/++etc++site/default/Negotiator/@@registration.html'
-
-Now we see the edit form of the added and registred negotiator instance called
-Negotiator. Set the language lookup policy to 'server'.
-
- >>> browser.open('http://localhost/++etc++site/default/Negotiator/'
- ... '@@edit.html')
- >>> browser.getControl(name='field.policy').value = ['server']
-
-and set a default server language called 'de'.
-
- >>> browser.getControl(name='field.serverLanguage').value = 'de'
-
-and save this part.
-
- >>> browser.getControl(name='UPDATE_SUBMIT').click()
-
-Now we also add a offered language.
-
- >>> browser.getControl(name='field.offeredLanguages.add').click()
- >>> browser.getControl(name='field.offeredLanguages.0.').value = 'de'
-
-And as last, we save the changes.
-
- >>> browser.getControl(name='UPDATE_SUBMIT').click()
-
-Now check if the set language is german. See the label at the submit button.
-
- >>> browser.getControl(name='UPDATE_SUBMIT').value
- 'Abschicken'
Deleted: z3c.language.negotiator/trunk/src/z3c/language/negotiator/ftests.py
===================================================================
--- z3c.language.negotiator/trunk/src/z3c/language/negotiator/ftests.py 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/src/z3c/language/negotiator/ftests.py 2009-11-29 04:51:14 UTC (rev 106095)
@@ -1,34 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-
-"""
-$Id$
-"""
-
-import unittest
-
-from zope.testing import doctest
-from zope.app.testing import functional
-
-
-def test_suite():
- return unittest.TestSuite((
- functional.FunctionalDocFileSuite(
- "browser.txt",
- optionflags=doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE),
- ))
-
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
\ No newline at end of file
Modified: z3c.language.negotiator/trunk/src/z3c/language/negotiator/generations/evolve1.py
===================================================================
--- z3c.language.negotiator/trunk/src/z3c/language/negotiator/generations/evolve1.py 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/src/z3c/language/negotiator/generations/evolve1.py 2009-11-29 04:51:14 UTC (rev 106095)
@@ -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
Modified: z3c.language.negotiator/trunk/src/z3c/language/negotiator/interfaces.py
===================================================================
--- z3c.language.negotiator/trunk/src/z3c/language/negotiator/interfaces.py 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/src/z3c/language/negotiator/interfaces.py 2009-11-29 04:51:14 UTC (rev 106095)
@@ -18,13 +18,13 @@
__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',
'browser --> session --> server', 'browser --> server',
'session --> browser --> server', 'session --> server']
Modified: z3c.language.negotiator/trunk/src/z3c/language/negotiator/testing.py
===================================================================
--- z3c.language.negotiator/trunk/src/z3c/language/negotiator/testing.py 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/src/z3c/language/negotiator/testing.py 2009-11-29 04:51:14 UTC (rev 106095)
@@ -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 zope.i18n.interfaces import INegotiator
-from z3c import testing
+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)
@@ -71,44 +56,12 @@
###############################################################################
#
-# 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
Modified: z3c.language.negotiator/trunk/src/z3c/language/negotiator/tests.py
===================================================================
--- z3c.language.negotiator/trunk/src/z3c/language/negotiator/tests.py 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/src/z3c/language/negotiator/tests.py 2009-11-29 04:51:14 UTC (rev 106095)
@@ -82,8 +82,6 @@
unittest.makeSuite(NegotiatorBaseTest),
unittest.makeSuite(NegotiatorTest),
DocFileSuite('README.txt',
- setUp=testing.doctestSetUp,
- tearDown=testing.doctestTearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
))
Modified: z3c.language.negotiator/trunk/src/z3c/language/negotiator/vocabulary.py
===================================================================
--- z3c.language.negotiator/trunk/src/z3c/language/negotiator/vocabulary.py 2009-11-29 04:21:27 UTC (rev 106094)
+++ z3c.language.negotiator/trunk/src/z3c/language/negotiator/vocabulary.py 2009-11-29 04:51:14 UTC (rev 106095)
@@ -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 @@
terms = []
# collect offered languages
- negotiator = zope.component.getUtility(interfaces.INegotiator)
+ negotiator = zope.component.getUtility(INegotiator)
languages = negotiator.offeredLanguages
for lang in languages:
More information about the checkins
mailing list