[Checkins] SVN: z3c.language/trunk/src/z3c/language/negotiator/generations/ Fix generation issue, do not use site hooks here

Roger Ineichen roger at projekt01.ch
Wed Nov 15 20:40:35 EST 2006


Log message for revision 71142:
  Fix generation issue, do not use site hooks here
  Remove generation test data

Changed:
  U   z3c.language/trunk/src/z3c/language/negotiator/generations/evolve1.py
  D   z3c.language/trunk/src/z3c/language/negotiator/generations/tests/generation-0.fs.index
  D   z3c.language/trunk/src/z3c/language/negotiator/generations/tests/generation-0.fs.lock
  D   z3c.language/trunk/src/z3c/language/negotiator/generations/tests/generation-0.fs.tmp

-=-
Modified: z3c.language/trunk/src/z3c/language/negotiator/generations/evolve1.py
===================================================================
--- z3c.language/trunk/src/z3c/language/negotiator/generations/evolve1.py	2006-11-15 20:45:31 UTC (rev 71141)
+++ z3c.language/trunk/src/z3c/language/negotiator/generations/evolve1.py	2006-11-16 01:40:34 UTC (rev 71142)
@@ -18,7 +18,6 @@
 
 import zope.component
 from zope.i18n.interfaces import INegotiator
-from zope.app.component import hooks
 from zope.app.generations.utility import findObjectsProviding
 from zope.app.zopeappgenerations import getRootFolder
 from zope.app.component.interfaces import ISite
@@ -37,11 +36,9 @@
     root = getRootFolder(context)
 
     for site in findObjectsProviding(root, ISite):
-        originalSite = hooks.getSite()
-        hooks.setSite(site)
 
         # check if we got the right object
-        obj = zope.component.queryUtility(INegotiator)
+        obj = zope.component.queryUtility(INegotiator, context=site)
         if interfaces.INegotiatorManager.providedBy(obj):
 
             # remove old unused ``sessionLanguages`` attr from all objects
@@ -49,6 +46,8 @@
 
             # migrate ``_serverLanguage`` to ``serverLanguage``
             serverLanguage = getattr(obj, '_serverLanguage')
+            if not serverLanguage:
+                serverLanguage = u'en'
             setattr(obj, 'serverLanguage', serverLanguage)
             delattr(obj, '_serverLanguage')
 
@@ -56,6 +55,3 @@
             offeredLanguages = getattr(obj, '_offeredLanguages')
             setattr(obj, 'offeredLanguages', offeredLanguages)
             delattr(obj, '_offeredLanguages')
-
-        # set the site back to the original site
-        hooks.setSite(originalSite)

Deleted: z3c.language/trunk/src/z3c/language/negotiator/generations/tests/generation-0.fs.index
===================================================================
(Binary files differ)

Deleted: z3c.language/trunk/src/z3c/language/negotiator/generations/tests/generation-0.fs.lock
===================================================================
--- z3c.language/trunk/src/z3c/language/negotiator/generations/tests/generation-0.fs.lock	2006-11-15 20:45:31 UTC (rev 71141)
+++ z3c.language/trunk/src/z3c/language/negotiator/generations/tests/generation-0.fs.lock	2006-11-16 01:40:34 UTC (rev 71142)
@@ -1 +0,0 @@
-4508

Deleted: z3c.language/trunk/src/z3c/language/negotiator/generations/tests/generation-0.fs.tmp
===================================================================



More information about the Checkins mailing list