[Checkins] SVN: Products.CMFDefault/trunk/ - moved the Zope dependency to version 2.12.0b3dev
Yvo Schubbe
y.2009 at wcm-solutions.de
Tue Jul 7 08:01:12 EDT 2009
Log message for revision 101694:
- moved the Zope dependency to version 2.12.0b3dev
- updated some imports
- removed obsolete BBB code
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
U Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/configure.zcml
U Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/document.txt
U Products.CMFDefault/trunk/Products/CMFDefault/factory.py
U Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
U Products.CMFDefault/trunk/Products/CMFDefault/tests/RegistrationTool.txt
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_DiscussionReply.py
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_join.py
U Products.CMFDefault/trunk/setup.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2009-07-07 12:01:11 UTC (rev 101694)
@@ -4,6 +4,8 @@
2.2.0 (unreleased)
------------------
+- moved the Zope dependency to version 2.12.0b3dev
+
- Add views: The standard INameChooser adapter from Products.Five
fails with BTreeFolder-based portal folders, so we need our own.
(https://bugs.launchpad.net/zope-cmf/+bug/377562)
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Favorite.py 2009-07-07 12:01:11 UTC (rev 101694)
@@ -20,10 +20,10 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
from App.class_init import InitializeClass
-from zope.app.container.interfaces import IObjectAddedEvent
from zope.component import adapter
from zope.component import getUtility
from zope.component.factory import Factory
+from zope.container.interfaces import IObjectAddedEvent
from zope.interface import implements
from Products.CMFCore.interfaces import ISiteRoot
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/configure.zcml 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/configure.zcml 2009-07-07 12:01:11 UTC (rev 101694)
@@ -200,10 +200,4 @@
permission="zope.Public"
/>
- <adapter
- for="Products.CMFCore.interfaces.IFolderish"
- factory=".folder.PortalFolderNameChooser"
- provides="zope.app.container.interfaces.INameChooser"
- />
-
</configure>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py 2009-07-07 12:01:11 UTC (rev 101694)
@@ -16,7 +16,6 @@
"""
from DocumentTemplate import sequence # for sort()
-from Products.Five.browser.adding import ObjectManagerNameChooser
from Products.PythonScripts.standard import thousands_commas
from zope.formlib.form import FormFields
from zope.schema import ASCIILine
@@ -639,46 +638,3 @@
self.request.RESPONSE.expireCookie('folderfilter', path='/')
self.request.RESPONSE.expireCookie('show_filter_form', path='/')
return True, _(u'Filter cleared.')
-
-
-# BBB: for Zope < 2.12
-class PortalFolderNameChooser(ObjectManagerNameChooser):
- """ A name chooser for a portal folder
-
- Overridden to behave correctly with BTreeFolder-based PortalFolders
- This class and the adapter registration can be removed as soon as the
- Products.Five.adding.ObjectManagerNameChooser works with BTreeFolders.
- """
-
- def chooseName(self, name, object):
- if not name:
- name = object.__class__.__name__
- else:
- try:
- name = name.encode('ascii')
- except UnicodeDecodeError:
- raise UserError, "Id must contain only ASCII characters."
-
- dot = name.rfind('.')
- if dot >= 0:
- suffix = name[dot:]
- name = name[:dot]
- else:
- suffix = ''
-
- n = name + suffix
- i = 0
- while True:
- i += 1
- try:
- self.context._getOb(n)
- except (AttributeError, KeyError):
- break
- n = name + '-' + str(i) + suffix
-
- # Make sure the name is valid. We may have started with
- # something bad.
- self.checkName(n, object)
-
- return n
-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/document.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/document.txt 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/document.txt 2009-07-07 12:01:11 UTC (rev 101694)
@@ -8,7 +8,7 @@
>>> uf = app.site.acl_users
>>> uf._doAddUser('mgr', 'mgrpw', ['Manager'], [])
- >>> from zope.app.component.hooks import setSite
+ >>> from zope.site.hooks import setSite
>>> setSite(app.site)
Create the browser object we'll be using.
Modified: Products.CMFDefault/trunk/Products/CMFDefault/factory.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/factory.py 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/factory.py 2009-07-07 12:01:11 UTC (rev 101694)
@@ -16,7 +16,7 @@
"""
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
from Products.CMFCore.interfaces import ISiteRoot
from Products.CMFCore.utils import getToolByName
Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py 2009-07-07 12:01:11 UTC (rev 101694)
@@ -22,16 +22,13 @@
from Products.Five.formlib.formbase import PageAddForm
from Products.Five.formlib.formbase import PageDisplayForm
from Products.Five.formlib.formbase import PageForm
-from zope.app.container.interfaces import INameChooser
from zope.component import adapts
from zope.component import getUtility
from zope.component.interfaces import IFactory
+from zope.container.interfaces import INameChooser
from zope.datetime import parseDatetimetz
from zope.formlib import form
from zope.formlib.interfaces import IPageForm
-from zope.i18n.interfaces import IUserPreferredLanguages
-from zope.i18n.locales import LoadLocaleError
-from zope.i18n.locales import locales
from zope.interface import implementsOnly
from ZTUtils import make_query
@@ -44,37 +41,10 @@
from Products.CMFDefault.utils import translate
-# from zope.publisher.http.HTTPRequest
-def _getLocale(request):
- envadapter = IUserPreferredLanguages(request, None)
- if envadapter is None:
- return None
-
- langs = envadapter.getPreferredLanguages()
- for httplang in langs:
- parts = (httplang.split('-') + [None, None])[:3]
- try:
- return locales.getLocale(*parts)
- except LoadLocaleError:
- # Just try the next combination
- pass
- else:
- # No combination gave us an existing locale, so use the default,
- # which is guaranteed to exist
- return locales.getLocale(None, None, None)
-
-
class _EditFormMixin(ViewBase):
template = ViewPageTemplateFile('editform.pt')
- def __init__(self, context, request):
- self.context = context
- self.request = request
- # BBB: for Zope 2.10
- if getattr(self.request, 'locale', None) is None:
- self.request.locale = _getLocale(request)
-
def _setRedirect(self, provider_id, action_path, keys=''):
provider = self._getTool(provider_id)
try:
@@ -132,9 +102,6 @@
self.context = context
self.request = request
self.ti = ti
- # BBB: for Zope 2.10
- if getattr(self.request, 'locale', None) is None:
- self.request.locale = _getLocale(request)
@property
def label(self):
@@ -267,13 +234,6 @@
template = ViewPageTemplateFile('viewform.pt')
- def __init__(self, context, request):
- self.context = context
- self.request = request
- # BBB: for Zope 2.10
- if getattr(self.request, 'locale', None) is None:
- self.request.locale = _getLocale(request)
-
@property
def label(self):
return self.context.Type()
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/RegistrationTool.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/RegistrationTool.txt 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/RegistrationTool.txt 2009-07-07 12:01:11 UTC (rev 101694)
@@ -26,9 +26,9 @@
Now we can set up a RegistrationTool with dummy context::
- >>> from zope.app.component.hooks import setSite
>>> from zope.component import getSiteManager
>>> from zope.component import getUtility
+ >>> from zope.site.hooks import setSite
>>> from Products.MailHost.interfaces import IMailHost
>>> setSite(app.site)
>>> app.site.setupCurrentSkin(app.REQUEST)
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_DiscussionReply.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_DiscussionReply.py 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_DiscussionReply.py 2009-07-07 12:01:11 UTC (rev 101694)
@@ -20,7 +20,7 @@
from AccessControl.SecurityManagement import newSecurityManager
from AccessControl.SecurityManagement import getSecurityManager
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
from Products.CMFDefault.testing import FunctionalLayer
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Image.py 2009-07-07 12:01:11 UTC (rev 101694)
@@ -24,8 +24,8 @@
import transaction
from AccessControl.SecurityManagement import newSecurityManager
from AccessControl.User import UnrestrictedUser
-from zope.app.component.hooks import setSite
from zope.interface.verify import verifyClass
+from zope.site.hooks import setSite
from zope.testing.cleanup import cleanUp
from Products.CMFCore.testing import ConformsToContent
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Portal.py 2009-07-07 12:01:11 UTC (rev 101694)
@@ -21,7 +21,7 @@
from AccessControl.SecurityManagement import newSecurityManager
from AccessControl.User import UnrestrictedUser
from Acquisition import aq_base
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
from Products.CMFDefault.testing import FunctionalLayer
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_join.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_join.py 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_join.py 2009-07-07 12:01:11 UTC (rev 101694)
@@ -18,7 +18,7 @@
import unittest
from Testing import ZopeTestCase
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
from Products.CMFDefault.testing import FunctionalLayer
Modified: Products.CMFDefault/trunk/setup.py
===================================================================
--- Products.CMFDefault/trunk/setup.py 2009-07-07 12:00:01 UTC (rev 101693)
+++ Products.CMFDefault/trunk/setup.py 2009-07-07 12:01:11 UTC (rev 101694)
@@ -46,7 +46,7 @@
],
install_requires=[
'setuptools',
- #'Zope2 >= 2.10.4',
+ 'Zope2 >= 2.12.0b3dev',
'Products.CMFCore',
'Products.GenericSetup',
],
More information about the Checkins
mailing list