[Zope-Checkins] SVN: Zope/trunk/lib/python/ Merge r40576 through
r40592 from 2.9 branch:
Philipp von Weitershausen
philikon at philikon.de
Tue Dec 6 11:36:03 EST 2005
Log message for revision 40607:
Merge r40576 through r40592 from 2.9 branch:
Log message for revision 40576:
No longer use the defaultLayer directive. It didn't do anything anyway.
Log message for revision 40587:
Update Five to 1.3c.
Log message for revision 40588:
Fred fix a speling error in Zope 3.2.
Log message for revision 40590:
sync with five repo
Log message for revision 40592:
Zope 2's version.txt will from now on reside on the Zope2 package.
The reason for that is because zpkg and distutils can't deal with arbitrary
data files that don't belong to a certain package.
Changed:
_U Zope/trunk/lib/python/
UU Zope/trunk/lib/python/App/tests/test_version_txt.py
UU Zope/trunk/lib/python/App/version_txt.py
U Zope/trunk/lib/python/Products/Five/CHANGES.txt
U Zope/trunk/lib/python/Products/Five/browser/configure.zcml
U Zope/trunk/lib/python/Products/Five/form/__init__.py
U Zope/trunk/lib/python/Products/Five/version.txt
_U Zope/trunk/lib/python/zope/
-=-
Property changes on: Zope/trunk/lib/python
___________________________________________________________________
Name: svn:externals
- ZConfig svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
BTrees svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/BTrees
persistent svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/persistent
ThreadedAsync svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/ThreadedAsync
transaction svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/transaction
ZEO svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/ZEO
ZODB svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/ZODB
ZopeUndo svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/ZopeUndo
zdaemon -r 39732 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon
pytz -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/pytz
zodbcode -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zodbcode
ClientCookie -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientCookie
mechanize -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize
+ ZConfig svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3.1
BTrees svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/BTrees
persistent svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/persistent
ThreadedAsync svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/ThreadedAsync
transaction svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/transaction
ZEO svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/ZEO
ZODB svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/ZODB
ZopeUndo svn://svn.zope.org/repos/main/ZODB/tags/3.6.0b4/src/ZopeUndo
zdaemon -r 39732 svn://svn.zope.org/repos/main/zdaemon/trunk/src/zdaemon
pytz -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/pytz
zodbcode -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zodbcode
ClientCookie -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/ClientCookie
mechanize -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/mechanize
Modified: Zope/trunk/lib/python/App/tests/test_version_txt.py
===================================================================
--- Zope/trunk/lib/python/App/tests/test_version_txt.py 2005-12-06 16:31:59 UTC (rev 40606)
+++ Zope/trunk/lib/python/App/tests/test_version_txt.py 2005-12-06 16:36:02 UTC (rev 40607)
@@ -11,23 +11,19 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
+"""Tests of the version number extraction.
-"""Tests of the version number extraction."""
-
+$Id$
+"""
import os
import unittest
-
-import App.config
+import Zope2
import App.version_txt
-
class VersionTextTestCase(unittest.TestCase):
def setUp(self):
- self.cfg = App.config.getConfiguration()
- self.old_swhome = self.cfg.softwarehome
- self.cfg.softwarehome = os.path.dirname(__file__)
- self.fn = os.path.join(self.cfg.softwarehome, "version.txt")
+ self.fn = os.path.join(os.path.dirname(Zope2.__file__), "version.txt")
App.version_txt._test_reset()
def tearDown(self):
@@ -35,8 +31,6 @@
os.unlink(self.fn)
except OSError:
pass
- self.cfg.softwarehome = self.old_swhome
- App.config.setConfiguration(self.cfg)
def writeVersion(self, s):
f = open(self.fn, 'w')
Property changes on: Zope/trunk/lib/python/App/tests/test_version_txt.py
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: Zope/trunk/lib/python/App/version_txt.py
===================================================================
--- Zope/trunk/lib/python/App/version_txt.py 2005-12-06 16:31:59 UTC (rev 40606)
+++ Zope/trunk/lib/python/App/version_txt.py 2005-12-06 16:36:02 UTC (rev 40607)
@@ -10,11 +10,13 @@
# FOR A PARTICULAR PURPOSE
#
##############################################################################
+"""Extract Zope 2 version information
-import os,sys,re
+$id$
+"""
+import os, sys, re
+import Zope2
-from App.config import getConfiguration
-
_version_string = None
_zope_version = None
@@ -29,8 +31,7 @@
if _version_string is None:
v = sys.version_info
pyver = "python %d.%d.%d, %s" % (v[0], v[1], v[2], sys.platform)
- cfg = getConfiguration()
- fn = os.path.join(cfg.softwarehome, 'version.txt')
+ fn = os.path.join(os.path.dirname(Zope2.__file__), 'version.txt')
expr = re.compile(
r'(?P<product>[A-Za-z0-9]+) +(?P<major>[0-9]+)'
'\.(?P<minor>[0-9]+)\.(?P<micro>[0-9]+)'
Property changes on: Zope/trunk/lib/python/App/version_txt.py
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: Zope/trunk/lib/python/Products/Five/CHANGES.txt
===================================================================
--- Zope/trunk/lib/python/Products/Five/CHANGES.txt 2005-12-06 16:31:59 UTC (rev 40606)
+++ Zope/trunk/lib/python/Products/Five/CHANGES.txt 2005-12-06 16:36:02 UTC (rev 40607)
@@ -2,7 +2,7 @@
Five Changes
============
-Five 1.3c (unreleased)
+Five 1.3c (2005-12-06)
======================
This version is also included in Zope 2.9b1.
@@ -10,6 +10,8 @@
Restructuring
-------------
+* (b6) No longer use the ``defaultLayer`` directive, it's been deprecated.
+
* (b4) Cleaned up security test.
* (b4) Made Five send a ContainerModifiedEvent when appropriate.
@@ -17,6 +19,8 @@
Bugfixes
--------
+* (b6) Fixed the form i18n messages to work with Zope 3.2 beta 1.
+
* (b3) Made the creation of custom skins work again. It was broken in
the port to Zope 3.2.
Modified: Zope/trunk/lib/python/Products/Five/browser/configure.zcml
===================================================================
--- Zope/trunk/lib/python/Products/Five/browser/configure.zcml 2005-12-06 16:31:59 UTC (rev 40606)
+++ Zope/trunk/lib/python/Products/Five/browser/configure.zcml 2005-12-06 16:36:02 UTC (rev 40607)
@@ -20,11 +20,6 @@
interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
/>
- <defaultLayer
- type="zope.publisher.interfaces.browser.IBrowserRequest"
- layer="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
- />
-
<browser:page
for="*"
name="absolute_url"
Modified: Zope/trunk/lib/python/Products/Five/form/__init__.py
===================================================================
--- Zope/trunk/lib/python/Products/Five/form/__init__.py 2005-12-06 16:31:59 UTC (rev 40606)
+++ Zope/trunk/lib/python/Products/Five/form/__init__.py 2005-12-06 16:36:02 UTC (rev 40607)
@@ -135,7 +135,7 @@
notify(ObjectModifiedEvent(content))
except WidgetsError, errors:
self.errors = errors
- status = _("An error occured.")
+ status = _("An error occurred.")
transaction.abort()
else:
setUpEditWidgets(self, self.schema, source=self.adapted,
@@ -178,7 +178,7 @@
self.createAndAdd(data)
except WidgetsError, errors:
self.errors = errors
- self.update_status = _("An error occured.")
+ self.update_status = _("An error occurred.")
return self.update_status
self.request.response.redirect(self.nextURL())
Modified: Zope/trunk/lib/python/Products/Five/version.txt
===================================================================
--- Zope/trunk/lib/python/Products/Five/version.txt 2005-12-06 16:31:59 UTC (rev 40606)
+++ Zope/trunk/lib/python/Products/Five/version.txt 2005-12-06 16:36:02 UTC (rev 40607)
@@ -1 +1 @@
-Five 1.3b5
+Five 1.3c
Property changes on: Zope/trunk/lib/python/zope
___________________________________________________________________
Name: svn:externals
- app -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/app
cachedescriptors -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors
component -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/component
configuration -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration
documenttemplate -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate
event -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event
exceptions -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions
hookable -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable
i18n -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18n
i18nmessageid -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18nmessageid
interface -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/interface
modulealias -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias
pagetemplate -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate
proxy -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/proxy
publisher -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher
schema -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema
security -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/security
server -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server
structuredtext -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext
tal -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tal
tales -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales
testing -r 39830 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
thread -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/thread
deprecation -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/deprecation
dottedname -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dottedname
formlib -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/formlib
index -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/index
testbrowser -r 40369 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/testbrowser
+ app -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/app
cachedescriptors -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/cachedescriptors
component -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/component
configuration -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/configuration
documenttemplate -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/documenttemplate
event -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/event
exceptions -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/exceptions
hookable -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/hookable
i18n -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18n
i18nmessageid -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/i18nmessageid
interface -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/interface
modulealias -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/modulealias
pagetemplate -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/pagetemplate
proxy -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/proxy
publisher -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/publisher
schema -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/schema
security -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/security
server -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/server
structuredtext -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/structuredtext
tal -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tal
tales -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/tales
testing -r 39830 svn://svn.zope.org/repos/main/zope.testing/trunk/src/zope/testing
thread -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/thread
deprecation -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/deprecation
dottedname -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/dottedname
formlib -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/formlib
index -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/index
testbrowser -r 40549 svn://svn.zope.org/repos/main/Zope3/trunk/src/zope/testbrowser
More information about the Zope-Checkins
mailing list