Log message for revision 93698: Backport ClientForm and mechanize externals fixes from trunk. Backport DateTime test fixes from trunk (due to updated pytz).
Changed: U Zope/branches/2.11/doc/CHANGES.txt _U Zope/branches/2.11/lib/python/ U Zope/branches/2.11/lib/python/DateTime/DateTime.py U Zope/branches/2.11/lib/python/DateTime/DateTime.txt U Zope/branches/2.11/lib/python/DateTime/pytz.txt -=- Modified: Zope/branches/2.11/doc/CHANGES.txt =================================================================== --- Zope/branches/2.11/doc/CHANGES.txt 2008-12-05 20:19:52 UTC (rev 93697) +++ Zope/branches/2.11/doc/CHANGES.txt 2008-12-05 20:29:37 UTC (rev 93698) @@ -8,6 +8,11 @@ Bugs Fixed + - Updated 'pytz' from '2007f' to '2008i'. + + - Moved svn:externals for 'mechanize', 'ClientPath', and 'pytz' to + versions managed outside the Zope3 trunk. + - Launchpad #174705: ensure that the error info object exposed to a 'tal:on_error' handler has attributes visible to restricted code. Property changes on: Zope/branches/2.11/lib/python ___________________________________________________________________ Modified: svn:externals - BTrees svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/BTrees ClientForm svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientForm RestrictedPython svn://svn.zope.org/repos/main/RestrictedPython/tags/3.4.2/src/RestrictedPython ThreadedAsync svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/ThreadedAsync ZConfig svn://svn.zope.org/repos/main/ZConfig/tags/2.5.1/ZConfig ZEO svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/ZEO ZODB svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/ZODB ZopeUndo svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/ZopeUndo docutils svn://svn.zope.org/repos/main/docutils/tags/0.4.0 mechanize svn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize persistent svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/persistent pytz svn://svn.zope.org/repos/main/pytz/tags/2008i/pytz transaction svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/transaction zdaemon svn://svn.zope.org/repos/main/zdaemon/tags/2.0.2/src/zdaemon zodbcode svn://svn.zope.org/repos/main/zodbcode/tags/3.4.0/src/zodbcode + BTrees svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/BTrees ClientForm svn://svn.zope.org/repos/main/ClientForm/as_package/0.2.9 RestrictedPython svn://svn.zope.org/repos/main/RestrictedPython/tags/3.4.2/src/RestrictedPython ThreadedAsync svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/ThreadedAsync ZConfig svn://svn.zope.org/repos/main/ZConfig/tags/2.5.1/ZConfig ZEO svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/ZEO ZODB svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/ZODB ZopeUndo svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/ZopeUndo docutils svn://svn.zope.org/repos/main/docutils/tags/0.4.0 mechanize svn://svn.zope.org/repos/main/mechanize/tags/0.1.9/mechanize persistent svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/persistent pytz svn://svn.zope.org/repos/main/pytz/tags/2008i/pytz transaction svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/transaction zdaemon svn://svn.zope.org/repos/main/zdaemon/tags/2.0.2/src/zdaemon zodbcode svn://svn.zope.org/repos/main/zodbcode/tags/3.4.0/src/zodbcode Modified: Zope/branches/2.11/lib/python/DateTime/DateTime.py =================================================================== --- Zope/branches/2.11/lib/python/DateTime/DateTime.py 2008-12-05 20:19:52 UTC (rev 93697) +++ Zope/branches/2.11/lib/python/DateTime/DateTime.py 2008-12-05 20:29:37 UTC (rev 93698) @@ -1848,5 +1848,5 @@ # Module methods def Timezones(): """Return the list of recognized timezone names""" - return list(PytzCache._zlst) + return sorted(list(PytzCache._zmap.values())) Modified: Zope/branches/2.11/lib/python/DateTime/DateTime.txt =================================================================== --- Zope/branches/2.11/lib/python/DateTime/DateTime.txt 2008-12-05 20:19:52 UTC (rev 93697) +++ Zope/branches/2.11/lib/python/DateTime/DateTime.txt 2008-12-05 20:29:37 UTC (rev 93698) @@ -11,10 +11,16 @@ Returns the list of recognized timezone names: >>> from DateTime import Timezones - >>> Timezones() # doctest: +ELLIPSIS - [...'Brazil/Acre'... 'Brazil/DeNoronha'... 'IDLE'... 'NZST'...] + >>> zones = set(Timezones()) +Almost all of the standard pytz timezones are included, with the exception +of some commonly-used but ambiguous abbreviations, where historical Zope +usage conflicts with the name used by pytz: + >>> import pytz + >>> [x for x in pytz.all_timezones if x not in zones] + ['CET', 'EET', 'EST', 'MET', 'MST', 'WET'] + Class DateTime ============== Modified: Zope/branches/2.11/lib/python/DateTime/pytz.txt =================================================================== --- Zope/branches/2.11/lib/python/DateTime/pytz.txt 2008-12-05 20:19:52 UTC (rev 93697) +++ Zope/branches/2.11/lib/python/DateTime/pytz.txt 2008-12-05 20:29:37 UTC (rev 93698) @@ -132,7 +132,7 @@ time zone names that can be mapped to offical zone names. >>> cache._zidx #doctest: +ELLIPSIS - ['australia/yancowinna'... 'gmt+0500'... 'europe/isle_of_man'...] + [... 'australia/yancowinna'... 'gmt+0500'... 'europe/isle_of_man'...] Note that there are more items in _zidx than in _zlst since there are multiple names for some time zones. _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins