[Zope-Checkins] SVN: Zope/branches/2.10-with-ZODB3.8/ Merged
revisions 80850-81880 via svnmerge from
Andreas Zeidler
az at zitc.de
Fri Nov 16 07:34:30 EST 2007
Log message for revision 81881:
Merged revisions 80850-81880 via svnmerge from
svn+ssh://svn.zope.org/repos/main/Zope/branches/2.10
........
r80942 | andreasjung | 2007-10-20 13:33:36 +0200 (Sat, 20 Oct 2007) | 4 lines
- Collector #151020: HTTP_CHAR_SET headers containing 'x-user-defined'
caused a LookupError exception. Unknown encodings are from now on
silently discarded.
........
r80944 | andreasjung | 2007-10-20 13:37:27 +0200 (Sat, 20 Oct 2007) | 2 lines
collector -> Launchpad
........
r81167 | hannosch | 2007-10-28 10:40:32 +0100 (Sun, 28 Oct 2007) | 2 lines
Backported discouraged warning for manage_* events from trunk
........
r81176 | andreasjung | 2007-10-29 14:08:34 +0100 (Mon, 29 Oct 2007) | 2 lines
preparing 2.10.5
........
r81816 | wichert | 2007-11-13 10:20:30 +0100 (Tue, 13 Nov 2007) | 1 line
Base the default location of softwarehome on Zope2, which is guaranteed not to be a namespace but always located inside the Zope2 software home. This fixes Zope2 breaking on systems which uses namespace packages for Products.*
........
Changed:
_U Zope/branches/2.10-with-ZODB3.8/
U Zope/branches/2.10-with-ZODB3.8/doc/CHANGES.txt
U Zope/branches/2.10-with-ZODB3.8/inst/WinBuilders/mk/zope.mk
U Zope/branches/2.10-with-ZODB3.8/inst/versions.py
U Zope/branches/2.10-with-ZODB3.8/lib/python/App/FindHomes.py
U Zope/branches/2.10-with-ZODB3.8/lib/python/OFS/CopySupport.py
U Zope/branches/2.10-with-ZODB3.8/lib/python/OFS/subscribers.py
U Zope/branches/2.10-with-ZODB3.8/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
U Zope/branches/2.10-with-ZODB3.8/lib/python/Products/PageTemplates/unicodeconflictresolver.py
-=-
Property changes on: Zope/branches/2.10-with-ZODB3.8
___________________________________________________________________
Name: svnmerge-integrated
- /Zope/branches/2.10:1-80849
+ /Zope/branches/2.10:1-81880
Modified: Zope/branches/2.10-with-ZODB3.8/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.10-with-ZODB3.8/doc/CHANGES.txt 2007-11-16 12:31:03 UTC (rev 81880)
+++ Zope/branches/2.10-with-ZODB3.8/doc/CHANGES.txt 2007-11-16 12:34:29 UTC (rev 81881)
@@ -8,8 +8,15 @@
- Backported feature from Zope 2.11 to support named temporary files.
- Zope 2.10.5 (unreleased)
+ Zope 2.10.5 (2007/10/30)
+ Other changes
+
+ - Turned deprecation warnings for manage_afterAdd, manage_beforeDelete
+ and manage_afterClone methods into discouraged warnings. These methods
+ will not be removed in Zope 2.11, but stay for the foreseeable future.
+ Using events is still highly encouraged.
+
Bugs fixed
- Launchpad #147201: treat container-class in zope.conf as a string,
@@ -33,6 +40,10 @@
- Collector #2339: ZPT: fixed unicode issue when using the 'structure'
directive
+ - Launchpad #151020: HTTP_CHAR_SET headers containing 'x-user-defined'
+ caused a LookupError exception. Unknown encodings are from now on
+ silently discarded.
+
Zope 2.10.4 (2007/06/23)
Other changes
Modified: Zope/branches/2.10-with-ZODB3.8/inst/WinBuilders/mk/zope.mk
===================================================================
--- Zope/branches/2.10-with-ZODB3.8/inst/WinBuilders/mk/zope.mk 2007-11-16 12:31:03 UTC (rev 81880)
+++ Zope/branches/2.10-with-ZODB3.8/inst/WinBuilders/mk/zope.mk 2007-11-16 12:34:29 UTC (rev 81881)
@@ -1,4 +1,4 @@
-ZOPEVERSION = 2.10.4-final
+ZOPEVERSION = 2.10.5-final
ZOPEDIRNAME := Zope-$(ZOPEVERSION)
ZOPE_REQUIRED_FILES=tmp/$(ZOPEDIRNAME).tgz
Modified: Zope/branches/2.10-with-ZODB3.8/inst/versions.py
===================================================================
--- Zope/branches/2.10-with-ZODB3.8/inst/versions.py 2007-11-16 12:31:03 UTC (rev 81880)
+++ Zope/branches/2.10-with-ZODB3.8/inst/versions.py 2007-11-16 12:34:29 UTC (rev 81881)
@@ -1,5 +1,5 @@
ZOPE_MAJOR_VERSION = '2.10'
-ZOPE_MINOR_VERSION = '4'
+ZOPE_MINOR_VERSION = '5'
ZOPE_BRANCH_NAME = '$Name$'[6:] or 'no-branch'
# always start prerelease branches with '0' to avoid upgrade
Modified: Zope/branches/2.10-with-ZODB3.8/lib/python/App/FindHomes.py
===================================================================
--- Zope/branches/2.10-with-ZODB3.8/lib/python/App/FindHomes.py 2007-11-16 12:31:03 UTC (rev 81880)
+++ Zope/branches/2.10-with-ZODB3.8/lib/python/App/FindHomes.py 2007-11-16 12:34:29 UTC (rev 81881)
@@ -26,7 +26,8 @@
try:
home = os.environ['SOFTWARE_HOME']
except KeyError:
- home = os.path.abspath(package_home(Products.__dict__))
+ import Zope2
+ home = os.path.abspath(package_home(Zope2.__dict__))
home, e = os.path.split(home)
d, e = os.path.split(home)
Modified: Zope/branches/2.10-with-ZODB3.8/lib/python/OFS/CopySupport.py
===================================================================
--- Zope/branches/2.10-with-ZODB3.8/lib/python/OFS/CopySupport.py 2007-11-16 12:31:03 UTC (rev 81880)
+++ Zope/branches/2.10-with-ZODB3.8/lib/python/OFS/CopySupport.py 2007-11-16 12:34:29 UTC (rev 81881)
@@ -272,24 +272,21 @@
try:
orig_container._delObject(orig_id, suppress_events=True)
except TypeError:
- # BBB: removed in Zope 2.11
orig_container._delObject(orig_id)
warnings.warn(
- "%s._delObject without suppress_events is deprecated "
- "and will be removed in Zope 2.11." %
- orig_container.__class__.__name__, DeprecationWarning)
+ "%s._delObject without suppress_events is discouraged."
+ % orig_container.__class__.__name__,
+ DeprecationWarning)
ob = aq_base(ob)
ob._setId(id)
try:
self._setObject(id, ob, set_owner=0, suppress_events=True)
except TypeError:
- # BBB: removed in Zope 2.11
self._setObject(id, ob, set_owner=0)
warnings.warn(
- "%s._setObject without suppress_events is deprecated "
- "and will be removed in Zope 2.11." %
- self.__class__.__name__, DeprecationWarning)
+ "%s._setObject without suppress_events is discouraged."
+ % self.__class__.__name__, DeprecationWarning)
ob = self._getOb(id)
notify(ObjectMovedEvent(ob, orig_container, orig_id, self, id))
@@ -362,11 +359,9 @@
try:
self._delObject(id, suppress_events=True)
except TypeError:
- # BBB: removed in Zope 2.11
self._delObject(id)
warnings.warn(
- "%s._delObject without suppress_events is deprecated "
- "and will be removed in Zope 2.11." %
+ "%s._delObject without suppress_events is discouraged." %
self.__class__.__name__, DeprecationWarning)
ob = aq_base(ob)
ob._setId(new_id)
@@ -376,11 +371,9 @@
try:
self._setObject(new_id, ob, set_owner=0, suppress_events=True)
except TypeError:
- # BBB: removed in Zope 2.11
self._setObject(new_id, ob, set_owner=0)
warnings.warn(
- "%s._setObject without suppress_events is deprecated "
- "and will be removed in Zope 2.11." %
+ "%s._setObject without suppress_events is discouraged." %
self.__class__.__name__, DeprecationWarning)
ob = self._getOb(new_id)
Modified: Zope/branches/2.10-with-ZODB3.8/lib/python/OFS/subscribers.py
===================================================================
--- Zope/branches/2.10-with-ZODB3.8/lib/python/OFS/subscribers.py 2007-11-16 12:31:03 UTC (rev 81880)
+++ Zope/branches/2.10-with-ZODB3.8/lib/python/OFS/subscribers.py 2007-11-16 12:34:29 UTC (rev 81881)
@@ -68,10 +68,8 @@
return
class_ = ob.__class__
warnings.warn(
- "%s.%s.%s is deprecated and will be removed in Zope 2.11, "
- "you should use event subscribers instead, and meanwhile "
- "mark the class with <five:deprecatedManageAddDelete/>"
- % (class_.__module__, class_.__name__, method_name),
+ "%s.%s.%s is discouraged. You should use event subscribers instead." %
+ (class_.__module__, class_.__name__, method_name),
DeprecationWarning)
##################################################
Modified: Zope/branches/2.10-with-ZODB3.8/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
===================================================================
--- Zope/branches/2.10-with-ZODB3.8/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py 2007-11-16 12:31:03 UTC (rev 81880)
+++ Zope/branches/2.10-with-ZODB3.8/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py 2007-11-16 12:34:29 UTC (rev 81881)
@@ -131,6 +131,15 @@
result = zpt.pt_render()
self.assertEqual(result.startswith(unicode('<div>üöä</div>', 'iso-8859-15')), True)
+ def testBug151020(self):
+ manage_addPageTemplate(self.app, 'test',
+ text='<div tal:content="python: request.get(\'data\')" />',
+ encoding='ascii')
+ zpt = self.app['test']
+ self.app.REQUEST.set('HTTP_ACCEPT_CHARSET', 'x-user-defined, iso-8859-15')
+ self.app.REQUEST.set('data', unicode('üöä', 'iso-8859-15').encode('utf-8'))
+ result = zpt.pt_render()
+ self.assertEqual(result.startswith(unicode('<div>üöä</div>', 'iso-8859-15')), False)
class ZopePageTemplateFileTests(ZopeTestCase):
Modified: Zope/branches/2.10-with-ZODB3.8/lib/python/Products/PageTemplates/unicodeconflictresolver.py
===================================================================
--- Zope/branches/2.10-with-ZODB3.8/lib/python/Products/PageTemplates/unicodeconflictresolver.py 2007-11-16 12:31:03 UTC (rev 81880)
+++ Zope/branches/2.10-with-ZODB3.8/lib/python/Products/PageTemplates/unicodeconflictresolver.py 2007-11-16 12:34:29 UTC (rev 81881)
@@ -84,7 +84,7 @@
try:
return unicode(text, enc)
- except UnicodeDecodeError:
+ except (LookupError, UnicodeDecodeError):
pass
return text
More information about the Zope-Checkins
mailing list