[Zope-Checkins] SVN: Zope/trunk/src/ZPublisher/BaseResponse.py Replace a left-over has_key with in operator.

[Stefan H. Holek]

Log message for revision 122165:
  Replace a left-over has_key with in operator.

Changed:
  U   Zope/trunk/src/ZPublisher/BaseResponse.py

-=-
Modified: Zope/trunk/src/ZPublisher/BaseResponse.py
===
--- Zope/trunk/src/ZPublisher/BaseResponse.py   2011-07-13 08:40:38 UTC (rev 
122164)
+++ Zope/trunk/src/ZPublisher/BaseResponse.py   2011-07-13 09:20:32 UTC (rev 
122165)
@@ -69,7 +69,7 @@
 cookie in the Response object.
 '''
 cookies = self.cookies
-if cookies.has_key(name):
+if name in cookies:
 cookie = cookies[name]
 else:
 cookie = cookies[name] = {}

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.13/ Restore ability to undo multiple transactions from the ZMI.

[Stefan H. Holek]

Log message for revision 122167:
  Restore ability to undo multiple transactions from the ZMI.

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/App/Undo.py

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===
--- Zope/branches/2.13/doc/CHANGES.rst  2011-07-13 09:28:26 UTC (rev 122166)
+++ Zope/branches/2.13/doc/CHANGES.rst  2011-07-13 09:31:48 UTC (rev 122167)
@@ -8,6 +8,15 @@
 2.13.9 (unreleased)
 ---
 
+Bugs Fixed
+++
+
+- Restore ability to undo multiple transactions from the ZMI by using the
+  `undoMultiple` API. Backported from trunk (r122087).
+
+Features Added
+++
+
 - Updated distributions:
 
   - Products.ZCatalog = 2.13.15

Modified: Zope/branches/2.13/src/App/Undo.py
===
--- Zope/branches/2.13/src/App/Undo.py  2011-07-13 09:28:26 UTC (rev 122166)
+++ Zope/branches/2.13/src/App/Undo.py  2011-07-13 09:31:48 UTC (rev 122167)
@@ -132,15 +132,16 @@
 def manage_undo_transactions(self, transaction_info=(), REQUEST=None):
 
 
-undo=self._p_jar.db().undo
-
+tids = {}
 for tid in transaction_info:
-tid=tid.split()
+tid = tid.split()
 if tid:
-transaction.get().note(Undo %s % ' '.join(tid[1:]))
-tid=decode64(tid[0])
-undo(tid)
+tids[decode64(tid[0])] = tid[-1]
 
+if tids:
+transaction.get().note(Undo %s % ' '.join(tids.values()))
+self._p_jar.db().undoMultiple(tids.keys())
+
 if REQUEST is None:
 return
 REQUEST['RESPONSE'].redirect(%s/manage_UndoForm % REQUEST['URL1'])

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/versions.cfg The version checker requires a hyphen here.

[Stefan H. Holek]

Log message for revision 114196:
  The version checker requires a hyphen here.

Changed:
  U   Zope/trunk/versions.cfg

-=-
Modified: Zope/trunk/versions.cfg
===
--- Zope/trunk/versions.cfg 2010-07-05 09:18:21 UTC (rev 114195)
+++ Zope/trunk/versions.cfg 2010-07-05 09:48:24 UTC (rev 114196)
@@ -13,7 +13,7 @@
 initgroups = 2.13.0
 Missing = 2.13.1
 MultiMapping = 2.13.0
-nt_svcutils = 2.13.0
+nt-svcutils = 2.13.0
 Persistence = 2.13.2
 Products.ZCTextIndex = 2.13.0
 Record = 2.13.0

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/alltests.cfg Restore python-gettext dependency.

[Stefan H. Holek]

Log message for revision 100355:
  Restore python-gettext dependency.

Changed:
  U   Zope/trunk/alltests.cfg

-=-
Modified: Zope/trunk/alltests.cfg
===
--- Zope/trunk/alltests.cfg 2009-05-25 07:19:10 UTC (rev 100354)
+++ Zope/trunk/alltests.cfg 2009-05-25 09:33:35 UTC (rev 100355)
@@ -79,6 +79,7 @@
 zope.app.securitypolicy
 zope.app.zptpage
 zope.app.zcmlfiles
+python-gettext
 
 
 defaults = ['--module', '!^(zope[.]app)[.]']

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Testing.ZopeTestCase: Include a copy of ZODB.tests.warnhook to silence a DeprecationWarning under Python 2.6.

[Stefan H. Holek]

Log message for revision 99895:
  Testing.ZopeTestCase: Include a copy of ZODB.tests.warnhook to silence a 
DeprecationWarning under Python 2.6.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Testing/ZopeTestCase/__init__.py
  A   Zope/trunk/src/Testing/ZopeTestCase/warnhook.py

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===
--- Zope/trunk/doc/CHANGES.rst  2009-05-13 17:18:20 UTC (rev 99894)
+++ Zope/trunk/doc/CHANGES.rst  2009-05-13 17:19:09 UTC (rev 99895)
@@ -16,6 +16,9 @@
 
 - Launchpad #374719: introducing new ZPublisher events:
   PubStart, PubSuccess, PubFailure, PubAfterTraversal and PubBeforeCommit.
+
+- Testing.ZopeTestCase: Include a copy of ZODB.tests.warnhook to silence
+  a DeprecationWarning under Python 2.6.
   
 Bugs Fixed
 ++

Modified: Zope/trunk/src/Testing/ZopeTestCase/__init__.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/__init__.py 2009-05-13 17:18:20 UTC 
(rev 99894)
+++ Zope/trunk/src/Testing/ZopeTestCase/__init__.py 2009-05-13 17:19:09 UTC 
(rev 99895)
@@ -43,7 +43,7 @@
 from base import app
 from base import close
 
-from ZODB.tests.warnhook import WarningsHook
+from warnhook import WarningsHook
 from unittest import main
 
 from zopedoctest import ZopeDocTestSuite

Added: Zope/trunk/src/Testing/ZopeTestCase/warnhook.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/warnhook.py 
(rev 0)
+++ Zope/trunk/src/Testing/ZopeTestCase/warnhook.py 2009-05-13 17:19:09 UTC 
(rev 99895)
@@ -0,0 +1,57 @@
+##
+#
+# Copyright (c) 2004 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED AS IS AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##
+import warnings
+
+class WarningsHook:
+Hook to capture warnings generated by Python.
+
+The function warnings.showwarning() is designed to be hooked by
+application code, allowing the application to customize the way it
+handles warnings.
+
+This hook captures the unformatted warning information and stores
+it in a list.  A test can inspect this list after the test is over.
+
+Issues:
+
+The warnings module has lots of delicate internal state.  If
+a warning has been reported once, it won't be reported again.  It
+may be necessary to extend this class with a mechanism for
+modifying the internal state so that we can be guaranteed a
+warning will be reported.
+
+If Python is run with a warnings filter, e.g. python -Werror,
+then a test that is trying to inspect a particular warning will
+fail.  Perhaps this class can be extended to install more-specific
+filters the test to work anyway.
+
+
+def __init__(self):
+self.original = None
+self.warnings = []
+
+def install(self):
+self.original = warnings.showwarning
+warnings.showwarning = self.showwarning
+
+def uninstall(self):
+assert self.original is not None
+warnings.showwarning = self.original
+self.original = None
+
+def showwarning(self, message, category, filename, lineno, file=None, 
line=None):
+self.warnings.append((str(message), category, filename, lineno))
+
+def clear(self):
+self.warnings = []


Property changes on: Zope/trunk/src/Testing/ZopeTestCase/warnhook.py
___
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/Zope2/utilities/mkzopeinstance.py Get the Zope2 path from the selected Python interpreter, which is not

[Stefan H. Holek]

Log message for revision 99032:
  Get the Zope2 path from the selected Python interpreter, which is not
  necessarily the same as the one used to run mkzopeinstance.
  

Changed:
  U   Zope/trunk/src/Zope2/utilities/mkzopeinstance.py

-=-
Modified: Zope/trunk/src/Zope2/utilities/mkzopeinstance.py
===
--- Zope/trunk/src/Zope2/utilities/mkzopeinstance.py2009-04-09 12:28:27 UTC 
(rev 99031)
+++ Zope/trunk/src/Zope2/utilities/mkzopeinstance.py2009-04-09 14:24:24 UTC 
(rev 99032)
@@ -123,8 +123,7 @@
 # we're on UNIX or we have a nonstandard Windows setup
 PYTHON = PYTHONW = python
 
-import Zope2
-zope2path = os.path.realpath(os.path.dirname(Zope2.__file__))
+zope2path = get_zope2path(PYTHON)
 
 kw = {
 PYTHON:PYTHON,
@@ -198,5 +197,15 @@
 parser.read('buildout.cfg')
 return 'zopepy' in parser.sections()
 
+def get_zope2path(python):
+ Get Zope2 path from selected Python interpreter.
+
+p = os.popen('%s -cimport os, Zope2; '
+ 'print os.path.realpath(os.path.dirname(Zope2.__file__))' % 
python)
+try:
+return p.readline()[:-1]
+finally:
+p.close()
+
 if __name__ == __main__:
 main()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/Zope2/utilities/mkzopeinstance.py Change indentation to reduce line length.

[Stefan H. Holek]

Log message for revision 99033:
  Change indentation to reduce line length.

Changed:
  U   Zope/trunk/src/Zope2/utilities/mkzopeinstance.py

-=-
Modified: Zope/trunk/src/Zope2/utilities/mkzopeinstance.py
===
--- Zope/trunk/src/Zope2/utilities/mkzopeinstance.py2009-04-09 14:24:24 UTC 
(rev 99032)
+++ Zope/trunk/src/Zope2/utilities/mkzopeinstance.py2009-04-09 15:14:35 UTC 
(rev 99033)
@@ -201,7 +201,7 @@
  Get Zope2 path from selected Python interpreter.
 
 p = os.popen('%s -cimport os, Zope2; '
- 'print os.path.realpath(os.path.dirname(Zope2.__file__))' % 
python)
+'print os.path.realpath(os.path.dirname(Zope2.__file__))' % python)
 try:
 return p.readline()[:-1]
 finally:

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/Zope2/utilities/mkzopeinstance.py Remove checks that cannot possibly fail.

[Stefan H. Holek]

Log message for revision 99039:
  Remove checks that cannot possibly fail.

Changed:
  U   Zope/trunk/src/Zope2/utilities/mkzopeinstance.py

-=-
Modified: Zope/trunk/src/Zope2/utilities/mkzopeinstance.py
===
--- Zope/trunk/src/Zope2/utilities/mkzopeinstance.py2009-04-09 15:49:07 UTC 
(rev 99038)
+++ Zope/trunk/src/Zope2/utilities/mkzopeinstance.py2009-04-09 15:50:58 UTC 
(rev 99039)
@@ -56,14 +56,8 @@
 for opt, arg in opts:
 if opt in (-d, --dir):
 skeltarget = os.path.abspath(os.path.expanduser(arg))
-if not skeltarget:
-usage(sys.stderr, dir must not be empty)
-sys.exit(2)
 if opt in (-s, --skelsrc):
 skelsrc = os.path.abspath(os.path.expanduser(arg))
-if not skelsrc:
-usage(sys.stderr, skelsrc must not be empty)
-sys.exit(2)
 if opt in (-p, --python):
 python = os.path.abspath(os.path.expanduser(arg))
 if not os.path.exists(python) and os.path.isfile(python):
@@ -73,9 +67,6 @@
 usage(sys.stdout)
 sys.exit()
 if opt in (-u, --user):
-if not arg:
-usage(sys.stderr, user must not be empty)
-sys.exit(2)
 if not : in arg:
 usage(sys.stderr, user must be specified as name:password)
 sys.exit(2)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/Zope2/utilities/mkzopeinstance.py Move interpreter check to where it also catches auto-detected interpreters.

[Stefan H. Holek]

Log message for revision 99044:
  Move interpreter check to where it also catches auto-detected interpreters.

Changed:
  U   Zope/trunk/src/Zope2/utilities/mkzopeinstance.py

-=-
Modified: Zope/trunk/src/Zope2/utilities/mkzopeinstance.py
===
--- Zope/trunk/src/Zope2/utilities/mkzopeinstance.py2009-04-09 15:54:09 UTC 
(rev 99043)
+++ Zope/trunk/src/Zope2/utilities/mkzopeinstance.py2009-04-09 15:55:49 UTC 
(rev 99044)
@@ -60,9 +60,6 @@
 skelsrc = os.path.abspath(os.path.expanduser(arg))
 if opt in (-p, --python):
 python = os.path.abspath(os.path.expanduser(arg))
-if not os.path.exists(python) and os.path.isfile(python):
-usage(sys.stderr, The Python interpreter does not exist.)
-sys.exit(2)
 if opt in (-h, --help):
 usage(sys.stdout)
 sys.exit()
@@ -72,6 +69,10 @@
 sys.exit(2)
 user, password = arg.split(:, 1)
 
+if python is not None and not os.path.isfile(python):
+usage(sys.stderr, The Python interpreter does not exist.)
+sys.exit(2)
+
 if not skeltarget:
 # interactively ask for skeltarget and initial user name/passwd.
 # cant set custom instancehome in interactive mode, we default

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/Zope2/utilities/mkzopeinstance.py Reverted r99039 and r99044. This is not what I came here for.

[Stefan H. Holek]

Log message for revision 99061:
  Reverted r99039 and r99044. This is not what I came here for.
  

Changed:
  U   Zope/trunk/src/Zope2/utilities/mkzopeinstance.py

-=-
Modified: Zope/trunk/src/Zope2/utilities/mkzopeinstance.py
===
--- Zope/trunk/src/Zope2/utilities/mkzopeinstance.py2009-04-09 17:05:57 UTC 
(rev 99060)
+++ Zope/trunk/src/Zope2/utilities/mkzopeinstance.py2009-04-09 20:45:16 UTC 
(rev 99061)
@@ -56,23 +56,31 @@
 for opt, arg in opts:
 if opt in (-d, --dir):
 skeltarget = os.path.abspath(os.path.expanduser(arg))
+if not skeltarget:
+usage(sys.stderr, dir must not be empty)
+sys.exit(2)
 if opt in (-s, --skelsrc):
 skelsrc = os.path.abspath(os.path.expanduser(arg))
+if not skelsrc:
+usage(sys.stderr, skelsrc must not be empty)
+sys.exit(2)
 if opt in (-p, --python):
 python = os.path.abspath(os.path.expanduser(arg))
+if not os.path.exists(python) and os.path.isfile(python):
+usage(sys.stderr, The Python interpreter does not exist.)
+sys.exit(2)
 if opt in (-h, --help):
 usage(sys.stdout)
 sys.exit()
 if opt in (-u, --user):
+if not arg:
+usage(sys.stderr, user must not be empty)
+sys.exit(2)
 if not : in arg:
 usage(sys.stderr, user must be specified as name:password)
 sys.exit(2)
 user, password = arg.split(:, 1)
 
-if python is not None and not os.path.isfile(python):
-usage(sys.stderr, The Python interpreter does not exist.)
-sys.exit(2)
-
 if not skeltarget:
 # interactively ask for skeltarget and initial user name/passwd.
 # cant set custom instancehome in interactive mode, we default

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/OFS/ObjectManager.py cfg.zopehome is no longer part of the default configuration.

[Stefan H. Holek]

Log message for revision 97638:
  cfg.zopehome is no longer part of the default configuration.

Changed:
  U   Zope/trunk/src/OFS/ObjectManager.py

-=-
Modified: Zope/trunk/src/OFS/ObjectManager.py
===
--- Zope/trunk/src/OFS/ObjectManager.py 2009-03-07 20:08:53 UTC (rev 97637)
+++ Zope/trunk/src/OFS/ObjectManager.py 2009-03-07 20:50:40 UTC (rev 97638)
@@ -618,7 +618,7 @@
 raise BadRequest, 'Invalid file name %s' % escape(file)
 
 cfg = getConfiguration()
-for impath in (cfg.instancehome, cfg.zopehome):
+for impath in (cfg.instancehome, getattr(cfg, 'zopehome', '')):
 filepath = os.path.join(impath, 'import', file)
 if os.path.exists(filepath):
 break

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/OFS/ObjectManager.py Extract _getImportPaths method.

[Stefan H. Holek]

Log message for revision 97639:
  Extract _getImportPaths method.

Changed:
  U   Zope/trunk/src/OFS/ObjectManager.py

-=-
Modified: Zope/trunk/src/OFS/ObjectManager.py
===
--- Zope/trunk/src/OFS/ObjectManager.py 2009-03-07 20:50:40 UTC (rev 97638)
+++ Zope/trunk/src/OFS/ObjectManager.py 2009-03-07 21:16:37 UTC (rev 97639)
@@ -618,7 +618,7 @@
 raise BadRequest, 'Invalid file name %s' % escape(file)
 
 cfg = getConfiguration()
-for impath in (cfg.instancehome, getattr(cfg, 'zopehome', '')):
+for impath in self._getImportPaths():
 filepath = os.path.join(impath, 'import', file)
 if os.path.exists(filepath):
 break
@@ -655,8 +655,7 @@
 ob=self._getOb(id)
 ob.manage_changeOwnershipType(explicit=0)
 
-def list_imports(self):
-listing = []
+def _getImportPaths(self):
 cfg = getConfiguration()
 paths = []
 zopehome = getattr(cfg, 'zopehome', None)
@@ -664,7 +663,11 @@
 paths.append(zopehome)
 if not cfg.instancehome in paths:
 paths.append(cfg.instancehome)
-for impath in paths:
+return paths
+
+def list_imports(self):
+listing = []
+for impath in self._getImportPaths():
 directory = os.path.join(impath, 'import')
 if not os.path.isdir(directory):
 continue

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/Testing/ZopeTestCase/ Remove testrunner boilerplate.

[Stefan H. Holek]

Log message for revision 97640:
  Remove testrunner boilerplate.

Changed:
  U   Zope/trunk/src/Testing/ZopeTestCase/testBaseTestCase.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testFunctional.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testInterfaces.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testPlaceless.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testPortalTestCase.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testPythonScript.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testSkeleton.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testWebserver.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testZODBCompat.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testZopeTestCase.py
  U   Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testAuthHeaderTest.py
  U   Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py
  U   Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py
  U   Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testWarningsTest.py
  U   Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py

-=-
Modified: Zope/trunk/src/Testing/ZopeTestCase/testBaseTestCase.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/testBaseTestCase.py 2009-03-07 
21:16:37 UTC (rev 97639)
+++ Zope/trunk/src/Testing/ZopeTestCase/testBaseTestCase.py 2009-03-07 
21:48:23 UTC (rev 97640)
@@ -21,10 +21,6 @@
 $Id$
 
 
-import os, sys
-if __name__ == '__main__':
-execfile(os.path.join(sys.path[0], 'framework.py'))
-
 import transaction
 
 from Testing.ZopeTestCase import base
@@ -463,6 +459,3 @@
 suite.addTest(makeSuite(TestRequestGarbage3))
 return suite
 
-if __name__ == '__main__':
-framework()
-

Modified: Zope/trunk/src/Testing/ZopeTestCase/testFunctional.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/testFunctional.py   2009-03-07 
21:16:37 UTC (rev 97639)
+++ Zope/trunk/src/Testing/ZopeTestCase/testFunctional.py   2009-03-07 
21:48:23 UTC (rev 97640)
@@ -18,10 +18,6 @@
 $Id$
 
 
-import os, sys
-if __name__ == '__main__':
-execfile(os.path.join(sys.path[0], 'framework.py'))
-
 from Testing import ZopeTestCase
 
 ZopeTestCase.installProduct('PythonScripts')
@@ -206,6 +202,3 @@
 suite.addTest(makeSuite(TestFunctional))
 return suite
 
-if __name__ == '__main__':
-framework()
-

Modified: Zope/trunk/src/Testing/ZopeTestCase/testInterfaces.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/testInterfaces.py   2009-03-07 
21:16:37 UTC (rev 97639)
+++ Zope/trunk/src/Testing/ZopeTestCase/testInterfaces.py   2009-03-07 
21:48:23 UTC (rev 97640)
@@ -15,10 +15,6 @@
 $Id$
 
 
-import os, sys
-if __name__ == '__main__':
-execfile(os.path.join(sys.path[0], 'framework.py'))
-
 from Testing.ZopeTestCase import *
 from Testing.ZopeTestCase.interfaces import *
 
@@ -99,6 +95,3 @@
 suite.addTest(makeSuite(TestPortalTestCase))
 return suite
 
-if __name__ == '__main__':
-framework()
-

Modified: Zope/trunk/src/Testing/ZopeTestCase/testPlaceless.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/testPlaceless.py2009-03-07 
21:16:37 UTC (rev 97639)
+++ Zope/trunk/src/Testing/ZopeTestCase/testPlaceless.py2009-03-07 
21:48:23 UTC (rev 97640)
@@ -15,10 +15,6 @@
 $Id$
 
 
-import os, sys
-if __name__ == '__main__':
-execfile(os.path.join(sys.path[0], 'framework.py'))
-
 from Testing import ZopeTestCase
 
 from Testing.ZopeTestCase.placeless import setUp, tearDown
@@ -92,6 +88,3 @@
 suite.addTest(makeSuite(TestPlacelessSetUp))
 return suite
 
-if __name__ == '__main__':
-framework()
-

Modified: Zope/trunk/src/Testing/ZopeTestCase/testPortalTestCase.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/testPortalTestCase.py   2009-03-07 
21:16:37 UTC (rev 97639)
+++ Zope/trunk/src/Testing/ZopeTestCase/testPortalTestCase.py   2009-03-07 
21:48:23 UTC (rev 97640)
@@ -21,10 +21,6 @@
 $Id$
 
 
-import os, sys
-if __name__ == '__main__':
-execfile(os.path.join(sys.path[0], 'framework.py'))
-
 from Testing import ZopeTestCase
 
 from Acquisition import aq_base
@@ -523,6 +519,3 @@
 suite.addTest(makeSuite(TestSetUpRaises))
 return suite
 
-if __name__ == '__main__':
-framework()
-

Modified: Zope/trunk/src/Testing/ZopeTestCase/testPythonScript.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/testPythonScript.py 2009-03-07 
21:16:37 UTC (rev 97639)
+++ Zope/trunk/src/Testing/ZopeTestCase/testPythonScript.py 2009-03-07 
21:48:23 UTC (rev 97640)
@@ -25,10 +25,6 @@
 $Id$
 
 
-import os, sys
-if __name__ == '__main__':
-execfile(os.path.join(sys.path[0], 'framework.py'))
-
 from Testing import ZopeTestCase
 
 

[Zope-Checkins] SVN: Zope/trunk/src/Testing/ZopeTestCase/ Remove ancient testrunner.

[Stefan H. Holek]

Log message for revision 97641:
  Remove ancient testrunner.

Changed:
  D   Zope/trunk/src/Testing/ZopeTestCase/runalltests.py
  D   Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/runalltests.py
  D   Zope/trunk/src/Testing/ZopeTestCase/ztc_common.py

-=-
Deleted: Zope/trunk/src/Testing/ZopeTestCase/runalltests.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/runalltests.py  2009-03-07 21:48:23 UTC 
(rev 97640)
+++ Zope/trunk/src/Testing/ZopeTestCase/runalltests.py  2009-03-07 21:57:53 UTC 
(rev 97641)
@@ -1,52 +0,0 @@
-##
-#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED AS IS AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##
-Runs all tests in the current directory [and below]
-
-Execute like:
-  python runalltests.py [-R]
-
-$Id$
-
-
-__version__ = '0.3.1'
-
-import os, sys
-if __name__ == '__main__':
-execfile(os.path.join(sys.path[0], 'framework.py'))
-
-import unittest
-TestRunner = unittest.TextTestRunner
-suite = unittest.TestSuite()
-cwd = os.getcwd()
-
-def test_finder(recurse, dir, names):
-if dir == os.curdir or '__init__.py' in names:
-parts = [x for x in dir[len(os.curdir):].split(os.sep) if x]
-tests = [x for x in names if x.startswith('test') and 
x.endswith('.py')]
-for test in tests:
-if test == 'tests.py' and 'ZopeTestCase' in cwd:
-# Skip tests.py when running ZTC tests
-continue
-modpath = parts + [test[:-3]]
-m = __import__('.'.join(modpath))
-for part in modpath[1:]:
-m = getattr(m, part)
-if hasattr(m, 'test_suite'):
-suite.addTest(m.test_suite())
-if not recurse:
-names[:] = []
-
-if __name__ == '__main__':
-os.path.walk(os.curdir, test_finder, '-R' in sys.argv)
-TestRunner().run(suite)
-

Deleted: Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/runalltests.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/runalltests.py  
2009-03-07 21:48:23 UTC (rev 97640)
+++ Zope/trunk/src/Testing/ZopeTestCase/zopedoctest/runalltests.py  
2009-03-07 21:57:53 UTC (rev 97641)
@@ -1,52 +0,0 @@
-##
-#
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED AS IS AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##
-Runs all tests in the current directory [and below]
-
-Execute like:
-  python runalltests.py [-R]
-
-$Id$
-
-
-__version__ = '0.3.1'
-
-import os, sys
-if __name__ == '__main__':
-execfile(os.path.join(sys.path[0], 'framework.py'))
-
-import unittest
-TestRunner = unittest.TextTestRunner
-suite = unittest.TestSuite()
-cwd = os.getcwd()
-
-def test_finder(recurse, dir, names):
-if dir == os.curdir or '__init__.py' in names:
-parts = [x for x in dir[len(os.curdir):].split(os.sep) if x]
-tests = [x for x in names if x.startswith('test') and 
x.endswith('.py')]
-for test in tests:
-if test == 'tests.py' and 'ZopeTestCase' in cwd:
-# Skip tests.py when running ZTC tests
-continue
-modpath = parts + [test[:-3]]
-m = __import__('.'.join(modpath))
-for part in modpath[1:]:
-m = getattr(m, part)
-if hasattr(m, 'test_suite'):
-suite.addTest(m.test_suite())
-if not recurse:
-names[:] = []
-
-if __name__ == '__main__':
-os.path.walk(os.curdir, test_finder, '-R' in sys.argv)
-TestRunner().run(suite)
-

Deleted: Zope/trunk/src/Testing/ZopeTestCase/ztc_common.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/ztc_common.py   2009-03-07 21:48:23 UTC 
(rev 97640)
+++ Zope/trunk/src/Testing/ZopeTestCase/ztc_common.py   2009-03-07 21:57:53 UTC 
(rev 97641)
@@ -1,171 +0,0 @@

[Zope-Checkins] SVN: Zope/trunk/src/Testing/ZopeTestCase/ Reverted r90443 and r90454. We keep the shopping cart tests working by including a copy of Examples.zexp.

[Stefan H. Holek]

Log message for revision 97643:
  Reverted r90443 and r90454. We keep the shopping cart tests working by 
including a copy of Examples.zexp.
  

Changed:
  U   Zope/trunk/src/Testing/ZopeTestCase/doc/ENVIRONMENT.txt
  U   Zope/trunk/src/Testing/ZopeTestCase/doc/HOWTO.stx
  U   Zope/trunk/src/Testing/ZopeTestCase/doc/README.stx
  U   Zope/trunk/src/Testing/ZopeTestCase/doc/TIMELINES.txt
  U   Zope/trunk/src/Testing/ZopeTestCase/testBaseTestCase.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testPortalTestCase.py
  A   Zope/trunk/src/Testing/ZopeTestCase/testShoppingCart.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testZopeTestCase.py
  A   Zope/trunk/src/Testing/ZopeTestCase/testimport/
  A   Zope/trunk/src/Testing/ZopeTestCase/testimport/Examples.zexp

-=-
Modified: Zope/trunk/src/Testing/ZopeTestCase/doc/ENVIRONMENT.txt
===
--- Zope/trunk/src/Testing/ZopeTestCase/doc/ENVIRONMENT.txt 2009-03-07 
22:04:50 UTC (rev 97642)
+++ Zope/trunk/src/Testing/ZopeTestCase/doc/ENVIRONMENT.txt 2009-03-07 
22:26:44 UTC (rev 97643)
@@ -2,9 +2,14 @@
 ZTC makes the following assumptions about its environment:
 
 a) The 'ZopeTestCase' package is installed in the Zope trunk inside the
-   'Testing' module.
+   'Testing' module, which means: SOFTWARE_HOME/Testing/ZopeTestCase.
 
-b) The somewhat weak assumption is that ZTC can walk up the directory tree from
+b) A 'Products' directory exists inside SOFTWARE_HOME and INSTANCE_HOME.
+
+c) The tests (the 'tests' subdirectories) are located either below a 
+   SOFTWARE_HOME or INSTANCE_HOME, typically in Products/MyCoolProduct/tests.
+
+d) The somewhat weak assumption is that ZTC can walk up the directory tree from
'tests', and find a 'Products' directory. This is how INSTANCE_HOME 
detection works. It regrettably fails on some filesystems when symbolic 
links are involved (a solution is detailed below, so hang on).
@@ -19,7 +24,8 @@
 
 
 ZTC attempts to resolve this by detecting an INSTANCE_HOME for 1) but leaving
-the actual environment variable untouched.
+the actual environment variable untouched so 2) works by still pointing into 
+SOFTWARE_HOME/Testing.
 
 As soon as I allow you to set INSTANCE_HOME yourself, I lose the ability to 
 distinguish whether you mean 1) or 2) or both. 

Modified: Zope/trunk/src/Testing/ZopeTestCase/doc/HOWTO.stx
===
--- Zope/trunk/src/Testing/ZopeTestCase/doc/HOWTO.stx   2009-03-07 22:04:50 UTC 
(rev 97642)
+++ Zope/trunk/src/Testing/ZopeTestCase/doc/HOWTO.stx   2009-03-07 22:26:44 UTC 
(rev 97643)
@@ -176,6 +176,9 @@
   It demonstrates how to manipulate the test user's roles and 
permissions and how
   security is validated.
 
+- **'testShoppingCart.py'** tests the ShoppingCart example. This test
+  uses Sessions and shows how to test a TTW Zope application.
+
 - **'testFunctional.py'** demonstrates the new functional testing 
features.
   Tests may call 'self.publish()' to simulate URL calls to the 
ZPublisher.
 

Modified: Zope/trunk/src/Testing/ZopeTestCase/doc/README.stx
===
--- Zope/trunk/src/Testing/ZopeTestCase/doc/README.stx  2009-03-07 22:04:50 UTC 
(rev 97642)
+++ Zope/trunk/src/Testing/ZopeTestCase/doc/README.stx  2009-03-07 22:26:44 UTC 
(rev 97643)
@@ -43,9 +43,27 @@
 Note that there is a skeleton test suite named 'testSkeleton.py' that you 
 may copy into your 'tests' directory and take it from there.
 
+Note also that when the tests are run in an INSTANCE_HOME installation of 
+Zope, you must set the SOFTWARE_HOME environment variable for the 
'Testing' 
+and 'ZopeTestCase' packages to be found.
+
 See the sample tests in the 'ZopeTestCase' directory for details on 
writing 
 your own tests.
 
+framework.py
+
+1. Uses SOFTWARE_HOME (if set) to locate the Testing package.
+
+2. Detects and handles INSTANCE_HOME installations of Zope. Please
+   see ENVIRONMENT.txt for the assumptions ZTC makes about its
+   environment.
+
+3. Supports setting up a ZODB from a 'custom_zodb.py' file in
+   the 'tests' directory.
+
+4. Allows to connect to a running ZEO server by setting the
+   ZEO_INSTANCE_HOME environment variable.
+
 testrunner.py
 
 Alternatively, you may use Zope's testrunner utility to run your tests 
@@ -53,7 +71,8 @@
 installation). If you do so, you will have to define a 'test_suite' method 
 in your modules (see examples). 
 
-You may have to provide the -i flag when testing in an INSTANCE_HOME setup.
+There is no need to set SOFTWARE_HOME when using the testrunner but you may
+have to provide the -i flag when testing in an INSTANCE_HOME setup.
 
 Example: 'python /path/to/Zope/utilities/testrunner.py -q -i -a'
 

Modified: Zope/trunk/src/Testing/ZopeTestCase/doc/TIMELINES.txt

[Zope-Checkins] SVN: Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py Shut up.

[Stefan H. Holek]

Log message for revision 96482:
  Shut up.

Changed:
  U   Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py

-=-
Modified: Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py
===
--- Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py 2009-02-12 18:34:52 UTC 
(rev 96481)
+++ Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py 2009-02-12 19:49:59 UTC 
(rev 96482)
@@ -35,8 +35,11 @@
 sys.setcheckinterval(2500)
 
 # Shut up if we are not in control of the import process
-_quiet = sys.modules.has_key('Zope2')
+#_quiet = sys.modules.has_key('Zope2')
 
+# Always shut up
+_quiet = True
+
 def _print(msg):
 '''Writes 'msg' to stderr and flushes the stream.'''
 sys.stderr.write(msg)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Ignore buildout stuff.

[Stefan H. Holek]

Log message for revision 96309:
  Ignore buildout stuff.

Changed:
  _U  Zope/trunk/

-=-

Property changes on: Zope/trunk
___
Modified: svn:ignore
   - access
bin
build
import
include
inituser
ZODBTests.fs*
makefile
Products
etc
log
build-base
testing.log
var

   + access
bin
build
import
include
inituser
ZODBTests.fs*
makefile
Products
etc
log
build-base
testing.log
var
develop-eggs
eggs
parts
.installed.cfg


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Update externals to new ZODB version.

[Stefan H. Holek]

Log message for revision 96313:
  Update externals to new ZODB version.

Changed:
  _U  Zope/trunk/include/
  _U  Zope/trunk/utilities/

-=-

Property changes on: Zope/trunk/include
___
Modified: svn:externals
   - Acquisition 
svn://svn.zope.org/repos/main/Acquisition/trunk/src/Acquisition
ExtensionClass  
svn://svn.zope.org/repos/main/ExtensionClass/trunk/src/ExtensionClass
persistent  svn://svn.zope.org/repos/main/ZODB/tags/3.8.0/src/persistent

   + Acquisition 
svn://svn.zope.org/repos/main/Acquisition/trunk/src/Acquisition
ExtensionClass  
svn://svn.zope.org/repos/main/ExtensionClass/trunk/src/ExtensionClass
persistent  svn://svn.zope.org/repos/main/ZODB/tags/3.9.0a10/src/persistent



Property changes on: Zope/trunk/utilities
___
Modified: svn:externals
   - ZODBTools svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/ZODB/scripts

   + ZODBTools svn://svn.zope.org/repos/main/ZODB/tags/3.9.0a10/src/ZODB/scripts


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/versions-zope2.cfg Upgrade RestrictedPython to 3.5.0.

[Stefan H. Holek]

Log message for revision 96357:
  Upgrade RestrictedPython to 3.5.0.

Changed:
  U   Zope/trunk/versions-zope2.cfg

-=-
Modified: Zope/trunk/versions-zope2.cfg
===
--- Zope/trunk/versions-zope2.cfg   2009-02-10 00:31:29 UTC (rev 96356)
+++ Zope/trunk/versions-zope2.cfg   2009-02-10 00:41:28 UTC (rev 96357)
@@ -9,6 +9,7 @@
 DateTime = 2.11.2
 ExtensionClass = 2.11.1
 Persistence = 2.11.1
+RestrictedPython = 3.5.0
 tempstorage = 2.11.1
 zLOG = 2.11.1
 zc.lockfile = 1.0

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/alltests.cfg Fetch zope.app.broken dependency.

[Stefan H. Holek]

Log message for revision 96358:
  Fetch zope.app.broken dependency.

Changed:
  U   Zope/trunk/alltests.cfg

-=-
Modified: Zope/trunk/alltests.cfg
===
--- Zope/trunk/alltests.cfg 2009-02-10 00:41:28 UTC (rev 96357)
+++ Zope/trunk/alltests.cfg 2009-02-10 00:42:32 UTC (rev 96358)
@@ -64,6 +64,7 @@
 zope.traversing
 zope.viewlet
 # Fetch undeclared ftests dependencies
+zope.app.broken
 zope.app.principalannotation
 zope.app.schema
 zope.app.securitypolicy

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/test.py Exclude a test whose requirements we can't satisfy.

[Stefan H. Holek]

Log message for revision 96050:
  Exclude a test whose requirements we can't satisfy.

Changed:
  U   Zope/trunk/test.py

-=-
Modified: Zope/trunk/test.py
===
--- Zope/trunk/test.py  2009-02-03 20:49:14 UTC (rev 96049)
+++ Zope/trunk/test.py  2009-02-03 22:39:48 UTC (rev 96050)
@@ -84,6 +84,10 @@
  '|'
  'zope[.]app'
  ')[.]']
+
+# The paste.txt doctest relies on zope.publisher being installed as egg
+defaults += ['-t', '!/zope/publisher.*/paste[.]txt']
+
 if ihome:
 ihome = os.path.abspath(ihome)
 defaults += ['--path', os.path.join(ihome, 'lib', 'python')]

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/OFS/tests/testCopySupportHooks.py Merged trunk r95406 into 2.10 branch.

[Stefan H. Holek]

Log message for revision 95427:
  Merged trunk r95406 into 2.10 branch.
  
  Use a layer to load the CA (we need the container handlers).
  

Changed:
  U   Zope/branches/2.10/lib/python/OFS/tests/testCopySupportHooks.py

-=-
Modified: Zope/branches/2.10/lib/python/OFS/tests/testCopySupportHooks.py
===
--- Zope/branches/2.10/lib/python/OFS/tests/testCopySupportHooks.py 
2009-01-29 13:08:34 UTC (rev 95426)
+++ Zope/branches/2.10/lib/python/OFS/tests/testCopySupportHooks.py 
2009-01-29 13:13:50 UTC (rev 95427)
@@ -5,6 +5,9 @@
 
 import transaction
 
+from zope.testing import cleanup
+from Products.Five import zcml
+
 from Testing.makerequest import makerequest
 
 from AccessControl.SecurityManagement import newSecurityManager
@@ -55,12 +58,27 @@
 
 
 from Products.Five.eventconfigure import setDeprecatedManageAddDelete
-setDeprecatedManageAddDelete(TestItem)
-setDeprecatedManageAddDelete(TestFolder)
 
+class HookLayer:
 
+@classmethod
+def setUp(cls):
+cleanup.cleanUp()
+zcml._initialized = 0
+zcml.load_site()
+setDeprecatedManageAddDelete(TestItem)
+setDeprecatedManageAddDelete(TestFolder)
+
+@classmethod
+def tearDown(cls):
+cleanup.cleanUp()
+zcml._initialized = 0
+
+
 class HookTest(unittest.TestCase):
 
+layer = HookLayer
+
 def setUp(self):
 self.app = makerequest(Zope2.app())
 try:

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/OFS/tests/testCopySupportHooks.py Merged trunk r95406 into 2.11 branch.

[Stefan H. Holek]

Log message for revision 95426:
  Merged trunk r95406 into 2.11 branch.
  
  Use a layer to load the CA (we need the container handlers).
  

Changed:
  U   Zope/branches/2.11/lib/python/OFS/tests/testCopySupportHooks.py

-=-
Modified: Zope/branches/2.11/lib/python/OFS/tests/testCopySupportHooks.py
===
--- Zope/branches/2.11/lib/python/OFS/tests/testCopySupportHooks.py 
2009-01-29 12:43:33 UTC (rev 95425)
+++ Zope/branches/2.11/lib/python/OFS/tests/testCopySupportHooks.py 
2009-01-29 13:08:34 UTC (rev 95426)
@@ -5,6 +5,9 @@
 
 import transaction
 
+from zope.testing import cleanup
+from Products.Five import zcml
+
 from Testing.makerequest import makerequest
 
 from AccessControl.SecurityManagement import newSecurityManager
@@ -55,12 +58,27 @@
 
 
 from Products.Five.eventconfigure import setDeprecatedManageAddDelete
-setDeprecatedManageAddDelete(TestItem)
-setDeprecatedManageAddDelete(TestFolder)
 
+class HookLayer:
 
+@classmethod
+def setUp(cls):
+cleanup.cleanUp()
+zcml._initialized = 0
+zcml.load_site()
+setDeprecatedManageAddDelete(TestItem)
+setDeprecatedManageAddDelete(TestFolder)
+
+@classmethod
+def tearDown(cls):
+cleanup.cleanUp()
+zcml._initialized = 0
+
+
 class HookTest(unittest.TestCase):
 
+layer = HookLayer
+
 def setUp(self):
 self.app = makerequest(Zope2.app())
 try:

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/doc/CHANGES.txt Not yet.

[Stefan H. Holek]

Log message for revision 95428:
  Not yet.

Changed:
  U   Zope/trunk/doc/CHANGES.txt

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2009-01-29 13:13:50 UTC (rev 95427)
+++ Zope/trunk/doc/CHANGES.txt  2009-01-29 13:16:22 UTC (rev 95428)
@@ -9,8 +9,6 @@
 
 Restructuring
 
-  - Using ZODB 3.9
-
   - Disabled the XML export on the UI level - the export functionality
 however is still available on the Python level.
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/ZopeUndo/ Revert -r95019 as it conflicts with the external.

[Stefan H. Holek]

Log message for revision 95213:
  Revert -r95019 as it conflicts with the external.

Changed:
  D   Zope/trunk/lib/python/ZopeUndo/

-=-
___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/ Do away with DemoStorage quota.

[Stefan H. Holek]

Log message for revision 95055:
  Do away with DemoStorage quota.

Changed:
  U   Zope/trunk/lib/python/OFS/tests/testCopySupport.py
  U   Zope/trunk/lib/python/OFS/tests/testFileAndImage.py
  U   Zope/trunk/lib/python/OFS/tests/testRanges.py
  U   Zope/trunk/lib/python/OFS/tests/testTraverse.py
  U   Zope/trunk/lib/python/Products/Sessions/tests/testSessionDataManager.py
  U   Zope/trunk/lib/python/Products/Transience/tests/testTimeoutRelated.py

-=-
Modified: Zope/trunk/lib/python/OFS/tests/testCopySupport.py
===
--- Zope/trunk/lib/python/OFS/tests/testCopySupport.py  2009-01-26 20:41:20 UTC 
(rev 95054)
+++ Zope/trunk/lib/python/OFS/tests/testCopySupport.py  2009-01-26 21:40:49 UTC 
(rev 95055)
@@ -62,7 +62,7 @@
 import ZODB
 from ZODB.DemoStorage import DemoStorage
 
-s = DemoStorage(quota=(120))
+s = DemoStorage()
 return ZODB.DB( s ).open()
 
 class CopySupportTestBase(unittest.TestCase):

Modified: Zope/trunk/lib/python/OFS/tests/testFileAndImage.py
===
--- Zope/trunk/lib/python/OFS/tests/testFileAndImage.py 2009-01-26 20:41:20 UTC 
(rev 95054)
+++ Zope/trunk/lib/python/OFS/tests/testFileAndImage.py 2009-01-26 21:40:49 UTC 
(rev 95055)
@@ -31,7 +31,7 @@
 import ZODB
 from ZODB.DemoStorage import DemoStorage
 
-s = DemoStorage(quota=(120))
+s = DemoStorage()
 return ZODB.DB( s ).open()
 
 

Modified: Zope/trunk/lib/python/OFS/tests/testRanges.py
===
--- Zope/trunk/lib/python/OFS/tests/testRanges.py   2009-01-26 20:41:20 UTC 
(rev 95054)
+++ Zope/trunk/lib/python/OFS/tests/testRanges.py   2009-01-26 21:40:49 UTC 
(rev 95055)
@@ -28,7 +28,7 @@
 import ZODB
 from ZODB.DemoStorage import DemoStorage
 
-s = DemoStorage(quota=(120))
+s = DemoStorage()
 return ZODB.DB( s ).open()
 
 def createBigFile():

Modified: Zope/trunk/lib/python/OFS/tests/testTraverse.py
===
--- Zope/trunk/lib/python/OFS/tests/testTraverse.py 2009-01-26 20:41:20 UTC 
(rev 95054)
+++ Zope/trunk/lib/python/OFS/tests/testTraverse.py 2009-01-26 21:40:49 UTC 
(rev 95055)
@@ -87,7 +87,7 @@
 from ZODB.DB import DB
 from ZODB.DemoStorage import DemoStorage
 
-s = DemoStorage(quota=(120))
+s = DemoStorage()
 self.connection = DB(s).open()
 
 try:

Modified: 
Zope/trunk/lib/python/Products/Sessions/tests/testSessionDataManager.py
===
--- Zope/trunk/lib/python/Products/Sessions/tests/testSessionDataManager.py 
2009-01-26 20:41:20 UTC (rev 95054)
+++ Zope/trunk/lib/python/Products/Sessions/tests/testSessionDataManager.py 
2009-01-26 21:40:49 UTC (rev 95055)
@@ -45,7 +45,7 @@
 def _getDB():
 db = stuff.get('db')
 if not db:
-ds = DemoStorage(quota=(120))
+ds = DemoStorage()
 db = ZODB.DB(ds, pool_size=60)
 conn = db.open()
 root = conn.root()

Modified: Zope/trunk/lib/python/Products/Transience/tests/testTimeoutRelated.py
===
--- Zope/trunk/lib/python/Products/Transience/tests/testTimeoutRelated.py   
2009-01-26 20:41:20 UTC (rev 95054)
+++ Zope/trunk/lib/python/Products/Transience/tests/testTimeoutRelated.py   
2009-01-26 21:40:49 UTC (rev 95055)
@@ -29,7 +29,7 @@
 
 app = stuff.get('app', None)
 if not app:
-ds = DemoStorage(quota=(120))
+ds = DemoStorage()
 db = ZODB.DB(ds)
 conn = db.open()
 root = conn.root()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/DocumentTemplate/__init__.py Since Globals is out, register the dtml-tree tag in DocumentTemplate.

[Stefan H. Holek]

Log message for revision 94813:
  Since Globals is out, register the dtml-tree tag in DocumentTemplate.

Changed:
  U   Zope/trunk/lib/python/DocumentTemplate/__init__.py

-=-
Modified: Zope/trunk/lib/python/DocumentTemplate/__init__.py
===
--- Zope/trunk/lib/python/DocumentTemplate/__init__.py  2009-01-17 22:05:13 UTC 
(rev 94812)
+++ Zope/trunk/lib/python/DocumentTemplate/__init__.py  2009-01-17 22:08:04 UTC 
(rev 94813)
@@ -20,3 +20,6 @@
 
 from DocumentTemplate.DT_String import String, File
 from DocumentTemplate.DT_HTML import HTML, HTMLDefault, HTMLFile
+
+# Register the dtml-tree tag
+import TreeDisplay

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/App/ Merged trunk r94458 and r94532 into 2.10 branch.

[Stefan H. Holek]

Log message for revision 94534:
  Merged trunk r94458 and r94532 into 2.10 branch.
  
  Replace messy tests with cleaned-up versions from trunk.
  

Changed:
  U   Zope/branches/2.10/lib/python/App/tests/test_version_txt.py
  U   Zope/branches/2.10/lib/python/App/version_txt.py

-=-
Modified: Zope/branches/2.10/lib/python/App/tests/test_version_txt.py
===
--- Zope/branches/2.10/lib/python/App/tests/test_version_txt.py 2009-01-05 
12:03:11 UTC (rev 94533)
+++ Zope/branches/2.10/lib/python/App/tests/test_version_txt.py 2009-01-05 
12:09:46 UTC (rev 94534)
@@ -15,41 +15,51 @@
 
 $Id$
 
-import os
 import unittest
-import Zope2
-import App.version_txt
 
 class VersionTextTestCase(unittest.TestCase):
 
 def setUp(self):
-self.fn = os.path.join(os.path.dirname(Zope2.__file__), version.txt)
-App.version_txt._test_reset()
+self._resetModuleGlobals()
 
 def tearDown(self):
-try:
-os.unlink(self.fn)
-except OSError:
-pass
+import os
+from App.version_txt import _version_file
+if _version_file is not None:
+os.unlink(_version_file)
+self._resetModuleGlobals()
 
+def _resetModuleGlobals(self):
+from App import version_txt
+version_txt._filename = 'version.txt'
+version_txt._version_file = None
+version_txt._version_string = None
+version_txt._zope_version = None
+
 def writeVersion(self, s):
-f = open(self.fn, 'w')
-f.write(s)
-f.close()
+import os
+import tempfile
+from App import version_txt 
+assert version_txt._version_file is None
+f, version_txt._version_file = tempfile.mkstemp()
+os.write(f, s)
+os.close(f)
 
 def test_without_version_txt(self):
-self.assertEqual(App.version_txt.getZopeVersion(),
- (-1, -1, -1, '', -1))
+from App import version_txt
+from App.version_txt import getZopeVersion
+version_txt._filename = ''
+self.assertEqual(getZopeVersion(), (-1, -1, -1, '', -1))
 
 def test_with_version_txt_final(self):
+from App.version_txt import getZopeVersion
 self.writeVersion(Zope 2.6.1 (source release, python 2.1, linux2))
-self.assertEqual(App.version_txt.getZopeVersion(),
- (2, 6, 1, '', -1))
+self.assertEqual(getZopeVersion(), (2, 6, 1, '', -1))
 
 def test_with_version_txt_beta(self):
+from App.version_txt import getZopeVersion
 self.writeVersion(Zope 2.6.1b2 (source release, python 2.1, linux2))
-self.assertEqual(App.version_txt.getZopeVersion(),
- (2, 6, 1, 'b', 2))
+self.assertEqual(getZopeVersion(), (2, 6, 1, 'b', 2))
 
 
 def test_suite():

Modified: Zope/branches/2.10/lib/python/App/version_txt.py
===
--- Zope/branches/2.10/lib/python/App/version_txt.py2009-01-05 12:03:11 UTC 
(rev 94533)
+++ Zope/branches/2.10/lib/python/App/version_txt.py2009-01-05 12:09:46 UTC 
(rev 94534)
@@ -14,24 +14,29 @@
 
 $id$
 
-import os, sys, re
+import os
+import re
+import sys
 import Zope2
 
+_location = os.path.dirname(Zope2.__file__)
+_filename = 'version.txt'
+
+_version_file = None
 _version_string = None
 _zope_version = None
 
-def _test_reset():
-# Needed for testing.
-global _version_string, _zope_version
-_version_string = None
-_zope_version = None
+def _get_filename():
+if _version_file is not None:
+return _version_file
+return os.path.join(_location, _filename)
 
 def _prep_version_data():
 global _version_string, _zope_version
 if _version_string is None:
 v = sys.version_info
 pyver = python %d.%d.%d, %s % (v[0], v[1], v[2], sys.platform)
-fn = os.path.join(os.path.dirname(Zope2.__file__), 'version.txt')
+fn = _get_filename()
 expr = re.compile(
 r'(?Pproduct[A-Za-z0-9]+) +(?Pmajor[0-9]+)'
 '\.(?Pminor[0-9]+)\.(?Pmicro[0-9]+)'

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/App/ Make the 'Cannot open version.txt' case testable.

[Stefan H. Holek]

Log message for revision 94532:
  Make the 'Cannot open version.txt' case testable.

Changed:
  U   Zope/trunk/lib/python/App/tests/test_version_txt.py
  U   Zope/trunk/lib/python/App/version_txt.py

-=-
Modified: Zope/trunk/lib/python/App/tests/test_version_txt.py
===
--- Zope/trunk/lib/python/App/tests/test_version_txt.py 2009-01-05 10:57:16 UTC 
(rev 94531)
+++ Zope/trunk/lib/python/App/tests/test_version_txt.py 2009-01-05 11:36:02 UTC 
(rev 94532)
@@ -31,6 +31,7 @@
 
 def _resetModuleGlobals(self):
 from App import version_txt
+version_txt._filename = 'version.txt'
 version_txt._version_file = None
 version_txt._version_string = None
 version_txt._zope_version = None
@@ -45,7 +46,9 @@
 os.close(f)
 
 def test_without_version_txt(self):
+from App import version_txt
 from App.version_txt import getZopeVersion
+version_txt._filename = ''
 self.assertEqual(getZopeVersion(), (-1, -1, -1, '', -1))
 
 def test_with_version_txt_final(self):

Modified: Zope/trunk/lib/python/App/version_txt.py
===
--- Zope/trunk/lib/python/App/version_txt.py2009-01-05 10:57:16 UTC (rev 
94531)
+++ Zope/trunk/lib/python/App/version_txt.py2009-01-05 11:36:02 UTC (rev 
94532)
@@ -17,16 +17,19 @@
 import os
 import re
 import sys
+import Zope2
 
+_location = os.path.dirname(Zope2.__file__)
+_filename = 'version.txt'
+
 _version_file = None
 _version_string = None
 _zope_version = None
 
 def _get_filename():
-import Zope2
 if _version_file is not None:
 return _version_file
-return os.path.join(os.path.dirname(Zope2.__file__), 'version.txt')
+return os.path.join(_location, _filename)
 
 def _prep_version_data():
 global _version_string, _zope_version

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/App/ Merged trunk r94458 and r94532 into 2.11 branch.

[Stefan H. Holek]

Log message for revision 94533:
  Merged trunk r94458 and r94532 into 2.11 branch.
  
  Replace messy tests with cleaned-up versions from trunk. The old tests 
deleted 'Zope2/version.txt' - WTFBBQ?
  

Changed:
  U   Zope/branches/2.11/lib/python/App/tests/test_version_txt.py
  U   Zope/branches/2.11/lib/python/App/version_txt.py

-=-
Modified: Zope/branches/2.11/lib/python/App/tests/test_version_txt.py
===
--- Zope/branches/2.11/lib/python/App/tests/test_version_txt.py 2009-01-05 
11:36:02 UTC (rev 94532)
+++ Zope/branches/2.11/lib/python/App/tests/test_version_txt.py 2009-01-05 
12:03:11 UTC (rev 94533)
@@ -15,41 +15,51 @@
 
 $Id$
 
-import os
 import unittest
-import Zope2
-import App.version_txt
 
 class VersionTextTestCase(unittest.TestCase):
 
 def setUp(self):
-self.fn = os.path.join(os.path.dirname(Zope2.__file__), version.txt)
-App.version_txt._test_reset()
+self._resetModuleGlobals()
 
 def tearDown(self):
-try:
-os.unlink(self.fn)
-except OSError:
-pass
+import os
+from App.version_txt import _version_file
+if _version_file is not None:
+os.unlink(_version_file)
+self._resetModuleGlobals()
 
+def _resetModuleGlobals(self):
+from App import version_txt
+version_txt._filename = 'version.txt'
+version_txt._version_file = None
+version_txt._version_string = None
+version_txt._zope_version = None
+
 def writeVersion(self, s):
-f = open(self.fn, 'w')
-f.write(s)
-f.close()
+import os
+import tempfile
+from App import version_txt 
+assert version_txt._version_file is None
+f, version_txt._version_file = tempfile.mkstemp()
+os.write(f, s)
+os.close(f)
 
 def test_without_version_txt(self):
-self.assertEqual(App.version_txt.getZopeVersion(),
- (-1, -1, -1, '', -1))
+from App import version_txt
+from App.version_txt import getZopeVersion
+version_txt._filename = ''
+self.assertEqual(getZopeVersion(), (-1, -1, -1, '', -1))
 
 def test_with_version_txt_final(self):
+from App.version_txt import getZopeVersion
 self.writeVersion(Zope 2.6.1 (source release, python 2.1, linux2))
-self.assertEqual(App.version_txt.getZopeVersion(),
- (2, 6, 1, '', -1))
+self.assertEqual(getZopeVersion(), (2, 6, 1, '', -1))
 
 def test_with_version_txt_beta(self):
+from App.version_txt import getZopeVersion
 self.writeVersion(Zope 2.6.1b2 (source release, python 2.1, linux2))
-self.assertEqual(App.version_txt.getZopeVersion(),
- (2, 6, 1, 'b', 2))
+self.assertEqual(getZopeVersion(), (2, 6, 1, 'b', 2))
 
 
 def test_suite():

Modified: Zope/branches/2.11/lib/python/App/version_txt.py
===
--- Zope/branches/2.11/lib/python/App/version_txt.py2009-01-05 11:36:02 UTC 
(rev 94532)
+++ Zope/branches/2.11/lib/python/App/version_txt.py2009-01-05 12:03:11 UTC 
(rev 94533)
@@ -14,24 +14,29 @@
 
 $id$
 
-import os, sys, re
+import os
+import re
+import sys
 import Zope2
 
+_location = os.path.dirname(Zope2.__file__)
+_filename = 'version.txt'
+
+_version_file = None
 _version_string = None
 _zope_version = None
 
-def _test_reset():
-# Needed for testing.
-global _version_string, _zope_version
-_version_string = None
-_zope_version = None
+def _get_filename():
+if _version_file is not None:
+return _version_file
+return os.path.join(_location, _filename)
 
 def _prep_version_data():
 global _version_string, _zope_version
 if _version_string is None:
 v = sys.version_info
 pyver = python %d.%d.%d, %s % (v[0], v[1], v[2], sys.platform)
-fn = os.path.join(os.path.dirname(Zope2.__file__), 'version.txt')
+fn = _get_filename()
 expr = re.compile(
 r'(?Pproduct[A-Za-z0-9]+) +(?Pmajor[0-9]+)'
 '\.(?Pminor[0-9]+)\.(?Pmicro[0-9]+)'

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/Globals/__init__.py Fix typos.

[Stefan H. Holek]

Log message for revision 94481:
  Fix typos.

Changed:
  U   Zope/trunk/lib/python/Globals/__init__.py

-=-
Modified: Zope/trunk/lib/python/Globals/__init__.py
===
--- Zope/trunk/lib/python/Globals/__init__.py   2009-01-03 15:42:02 UTC (rev 
94480)
+++ Zope/trunk/lib/python/Globals/__init__.py   2009-01-03 15:47:11 UTC (rev 
94481)
@@ -24,9 +24,9 @@
   )
 
 deprecated(import from App.Common instead,
-   package_home = 'App.Common.package_home',
-   attrget = 'App.Common.attrget',
-   Dictionary = 'App.Common.Dictionary',
+   package_home = 'App.Common:package_home',
+   attrget = 'App.Common:attrget',
+   Dictionary = 'App.Common:Dictionary',
   )
 
 deprecated(import from Persistence instead,

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/Five/security.py Restore Products.Five.security.initializeClass.

[Stefan H. Holek]

Log message for revision 94498:
  Restore Products.Five.security.initializeClass.

Changed:
  U   Zope/trunk/lib/python/Products/Five/security.py

-=-
Modified: Zope/trunk/lib/python/Products/Five/security.py
===
--- Zope/trunk/lib/python/Products/Five/security.py 2009-01-03 23:57:24 UTC 
(rev 94497)
+++ Zope/trunk/lib/python/Products/Five/security.py 2009-01-04 07:44:36 UTC 
(rev 94498)
@@ -26,6 +26,7 @@
 from zope.security.management import thread_local
 from zope.security.simplepolicies import ParanoidSecurityPolicy
 
+from App.class_init import InitializeClass as initializeClass
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/ Use ClientForm 0.2.10.

[Stefan H. Holek]

Log message for revision 94340:
  Use ClientForm 0.2.10.
  

Changed:
  _U  Zope/branches/2.11/lib/python/

-=-

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/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.10/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.10
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.10/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


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/zope/ Use zope.testbrowser 3.5.2.

[Stefan H. Holek]

Log message for revision 94341:
  Use zope.testbrowser 3.5.2.
  

Changed:
  _U  Zope/branches/2.11/lib/python/zope/

-=-

Property changes on: Zope/branches/2.11/lib/python/zope
___
Modified: svn:externals
   - annotation   
svn://svn.zope.org/repos/main/zope.annotation/tags/3.4.0/src/zope/annotation
cachedescriptors 
svn://svn.zope.org/repos/main/zope.cachedescriptors/tags/3.4.0/src/zope/cachedescriptors
component
svn://svn.zope.org/repos/main/zope.component/tags/3.4.0/src/zope/component
configuration
svn://svn.zope.org/repos/main/zope.configuration/tags/3.4.0/src/zope/configuration
contentprovider  
svn://svn.zope.org/repos/main/zope.contentprovider/tags/3.4.0/src/zope/contentprovider
contenttype  
svn://svn.zope.org/repos/main/zope.contenttype/tags/3.4.0/src/zope/contenttype
copypastemove
svn://svn.zope.org/repos/main/zope.copypastemove/tags/3.4.0/src/zope/copypastemove
datetime 
svn://svn.zope.org/repos/main/zope.datetime/tags/3.4.0/src/zope/datetime
decorator
svn://svn.zope.org/repos/main/zope.decorator/tags/3.4.0/src/zope/decorator
deferredimport   
svn://svn.zope.org/repos/main/zope.deferredimport/tags/3.4.0/src/zope/deferredimport
deprecation  
svn://svn.zope.org/repos/main/zope.deprecation/tags/3.4.0/src/zope/deprecation
documenttemplate 
svn://svn.zope.org/repos/main/zope.documenttemplate/tags/3.4.0/src/zope/documenttemplate
dottedname   
svn://svn.zope.org/repos/main/zope.dottedname/tags/3.4.2/src/zope/dottedname
dublincore   
svn://svn.zope.org/repos/main/zope.dublincore/tags/3.4.0/src/zope/dublincore
error
svn://svn.zope.org/repos/main/zope.error/tags/3.5.1/src/zope/error
event
svn://svn.zope.org/repos/main/zope.event/tags/3.4.0/src/zope/event
exceptions   
svn://svn.zope.org/repos/main/zope.exceptions/tags/3.4.0/src/zope/exceptions
filerepresentation   
svn://svn.zope.org/repos/main/zope.filerepresentation/tags/3.4.0/src/zope/filerepresentation
formlib  
svn://svn.zope.org/repos/main/zope.formlib/tags/3.4.0/src/zope/formlib
hookable 
svn://svn.zope.org/repos/main/zope.hookable/tags/3.4.0/src/zope/hookable
i18nmessageid
svn://svn.zope.org/repos/main/zope.i18nmessageid/tags/3.4.3/src/zope/i18nmessageid
i18n 
svn://svn.zope.org/repos/main/zope.i18n/tags/3.4.0/src/zope/i18n
index
svn://svn.zope.org/repos/main/zope.index/tags/3.4.1/src/zope/index
interface
svn://svn.zope.org/repos/main/zope.interface/tags/3.4.0/src/zope/interface
lifecycleevent   
svn://svn.zope.org/repos/main/zope.lifecycleevent/tags/3.4.0/src/zope/lifecycleevent
location 
svn://svn.zope.org/repos/main/zope.location/tags/3.4.0/src/zope/location
minmax   
svn://svn.zope.org/repos/main/zope.minmax/tags/1.0/src/zope/minmax
modulealias  
svn://svn.zope.org/repos/main/zope.modulealias/tags/3.4.0/src/zope/modulealias
pagetemplate 
svn://svn.zope.org/repos/main/zope.pagetemplate/tags/3.4.0/src/zope/pagetemplate
proxy
svn://svn.zope.org/repos/main/zope.proxy/tags/3.4.0/src/zope/proxy
publisher
svn://svn.zope.org/repos/main/zope.publisher/tags/3.4.3/src/zope/publisher
rdb  
svn://svn.zope.org/repos/main/zope.rdb/tags/3.4.0/src/zope/rdb
schema   
svn://svn.zope.org/repos/main/zope.schema/tags/3.4.0/src/zope/schema
security 
svn://svn.zope.org/repos/main/zope.security/tags/3.4.0/src/zope/security
sequencesort 
svn://svn.zope.org/repos/main/zope.sequencesort/tags/3.4.0/src/zope/sequencesort
sendmail 
svn://svn.zope.org/repos/main/zope.sendmail/tags/3.4.0/src/zope/sendmail
server   
svn://svn.zope.org/repos/main/zope.server/tags/3.4.1/src/zope/server
session  
svn://svn.zope.org/repos/main/zope.session/tags/3.4.1/src/zope/session
size 
svn://svn.zope.org/repos/main/zope.size/tags/3.4.0/src/zope/size
securitypolicy   
svn://svn.zope.org/repos/main/zope.securitypolicy/tags/3.4.0/src/zope/securitypolicy
   
structuredtext   
svn://svn.zope.org/repos/main/zope.structuredtext/tags/3.4.0/src/zope/structuredtext
tales
svn://svn.zope.org/repos/main/zope.tales/tags/3.4.0/src/zope/tales
tal  
svn://svn.zope.org/repos/main/zope.tal/tags/3.4.0/src/zope/tal
testbrowser  
svn://svn.zope.org/repos/main/zope.testbrowser/tags/3.4.2-zope2/src/zope/testbrowser
testing  
svn://svn.zope.org/repos/main/zope.testing/tags/3.5.3/src/zope/testing
thread   
svn://svn.zope.org/repos/main/zope.thread/tags/3.4/src/zope/thread
traversing   
svn://svn.zope.org/repos/main/zope.traversing/tags/3.4.0/src/zope/traversing
viewlet  
svn://svn.zope.org/repos/main/zope.viewlet/tags/3.4.2/src/zope/viewlet
wfmc 

[Zope-Checkins] SVN: Zope/trunk/lib/python/ Use ClientForm 0.2.10.

[Stefan H. Holek]

Log message for revision 94344:
  Use ClientForm 0.2.10.
  

Changed:
  _U  Zope/trunk/lib/python/

-=-

Property changes on: Zope/trunk/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/ClientForm/as_package/0.2.9
RestrictedPython 
svn://svn.zope.org/repos/main/RestrictedPython/tags/3.4.3/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/branches/3.8/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.10/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.10
RestrictedPython 
svn://svn.zope.org/repos/main/RestrictedPython/tags/3.4.3/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/branches/3.8/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.10/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


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/ Use mechanize 0.1.10 to catch up with 2.11 branch.

[Stefan H. Holek]

Log message for revision 94246:
  Use mechanize 0.1.10 to catch up with 2.11 branch.

Changed:
  _U  Zope/trunk/lib/python/

-=-

Property changes on: Zope/trunk/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/ClientForm/as_package/0.2.9
RestrictedPython 
svn://svn.zope.org/repos/main/RestrictedPython/tags/3.4.3/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/branches/3.8/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

   + 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.3/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/branches/3.8/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.10/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


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/ Updated pytz external to 2008i; the copy on /Zope3/trunk has gone away.

[Stefan H. Holek]

Log message for revision 93640:
  Updated pytz external to 2008i; the copy on /Zope3/trunk has gone away.
  

Changed:
  _U  Zope/branches/2.11/lib/python/

-=-

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
mechanizesvn://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/Zope3/trunk/src/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/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
mechanizesvn://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


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Remove quota argument from DemoStorage calls in preparation for ZODB 3.9.

[Stefan H. Holek]

Log message for revision 93256:
  Remove quota argument from DemoStorage calls in preparation for ZODB 3.9.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2008-11-22 01:39:02 UTC (rev 93255)
+++ Zope/trunk/doc/CHANGES.txt  2008-11-22 08:58:41 UTC (rev 93256)
@@ -219,6 +219,9 @@
 
 Bugs Fixed
 
+  - Testing.ZopeTestCase: Remove quota argument from DemoStorage calls in
+preparation for ZODB 3.9.
+
   - Ported c69896 to Five. This fix makes it possible to provide a
 template using Python, and not have it being set to `None` by
 the viewlet manager directive.

Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py  2008-11-22 
01:39:02 UTC (rev 93255)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py  2008-11-22 
08:58:41 UTC (rev 93256)
@@ -229,9 +229,7 @@
 def sandbox(base=None):
 '''Returns a sandbox copy of the base ZODB.'''
 if base is None: base = Zope2.DB
-base_storage = base._storage
-quota = getattr(base_storage, '_quota', None)
-storage = DemoStorage(base=base_storage, quota=quota)
+storage = DemoStorage(base=base._storage)
 return ZODB.DB(storage)
 
 _write(' done (%.3fs)\n' % (time.time() - _start))

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/ Remove quota argument from DemoStorage calls in preparation for ZODB 3.9.

[Stefan H. Holek]

Log message for revision 93257:
  Remove quota argument from DemoStorage calls in preparation for ZODB 3.9.
  

Changed:
  U   Zope/branches/2.11/doc/CHANGES.txt
  U   Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py

-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===
--- Zope/branches/2.11/doc/CHANGES.txt  2008-11-22 08:58:41 UTC (rev 93256)
+++ Zope/branches/2.11/doc/CHANGES.txt  2008-11-22 08:58:59 UTC (rev 93257)
@@ -8,6 +8,9 @@
 
 Bugs Fixed
   
+  - Testing.ZopeTestCase: Remove quota argument from DemoStorage calls in
+preparation for ZODB 3.9.
+
   Zope 2.11.2 (2008/10/24) 
 
 Bugs Fixed

Modified: Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py
===
--- Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py  
2008-11-22 08:58:41 UTC (rev 93256)
+++ Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py  
2008-11-22 08:58:59 UTC (rev 93257)
@@ -229,9 +229,7 @@
 def sandbox(base=None):
 '''Returns a sandbox copy of the base ZODB.'''
 if base is None: base = Zope2.DB
-base_storage = base._storage
-quota = getattr(base_storage, '_quota', None)
-storage = DemoStorage(base=base_storage, quota=quota)
+storage = DemoStorage(base=base._storage)
 return ZODB.DB(storage)
 
 _write(' done (%.3fs)\n' % (time.time() - _start))

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/Testing/custom_zodb.py Remove quota argument.

[Stefan H. Holek]

Log message for revision 93258:
  Remove quota argument.

Changed:
  U   Zope/trunk/lib/python/Testing/custom_zodb.py

-=-
Modified: Zope/trunk/lib/python/Testing/custom_zodb.py
===
--- Zope/trunk/lib/python/Testing/custom_zodb.py2008-11-22 08:58:59 UTC 
(rev 93257)
+++ Zope/trunk/lib/python/Testing/custom_zodb.py2008-11-22 09:24:48 UTC 
(rev 93258)
@@ -31,6 +31,6 @@
 else:
 from ZODB.DemoStorage import DemoStorage
 LOG.info('Using DemoStorage')
-return DemoStorage(quota=(120))
+return DemoStorage()
 
 Storage = getStorage()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/Testing/custom_zodb.py Remove quota argument.

[Stefan H. Holek]

Log message for revision 93259:
  Remove quota argument.

Changed:
  U   Zope/branches/2.11/lib/python/Testing/custom_zodb.py

-=-
Modified: Zope/branches/2.11/lib/python/Testing/custom_zodb.py
===
--- Zope/branches/2.11/lib/python/Testing/custom_zodb.py2008-11-22 
09:24:48 UTC (rev 93258)
+++ Zope/branches/2.11/lib/python/Testing/custom_zodb.py2008-11-22 
09:25:08 UTC (rev 93259)
@@ -31,6 +31,6 @@
 else:
 from ZODB.DemoStorage import DemoStorage
 LOG.info('Using DemoStorage')
-return DemoStorage(quota=(120))
+return DemoStorage()
 
 Storage = getStorage()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/PythonScripts/patches.py Fix version check. See second comment here: https://bugs.launchpad.net/zope2/+bug/257276

[Stefan H. Holek]

Log message for revision 92699:
  Fix version check. See second comment here: 
https://bugs.launchpad.net/zope2/+bug/257276
  

Changed:
  U   Zope/trunk/lib/python/Products/PythonScripts/patches.py

-=-
Modified: Zope/trunk/lib/python/Products/PythonScripts/patches.py
===
--- Zope/trunk/lib/python/Products/PythonScripts/patches.py 2008-10-30 
13:22:20 UTC (rev 92698)
+++ Zope/trunk/lib/python/Products/PythonScripts/patches.py 2008-10-30 
13:35:50 UTC (rev 92699)
@@ -95,7 +95,7 @@
 # Return the registry entry
 return entry
 
-if sys.version_info = (2, 4, 5):
+if sys.version_info[:2]  (2, 5):
 import encodings
 encodings.search_function.func_code = search_function.func_code
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/ Reverted r89899 (version bump).

[Stefan H. Holek]

Log message for revision 92640:
  Reverted r89899 (version bump).
  

Changed:
  U   Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
  U   Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/VERSION.txt

-=-
Modified: Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
===
--- Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt  
2008-10-27 22:34:04 UTC (rev 92639)
+++ Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt  
2008-10-27 23:12:13 UTC (rev 92640)
@@ -1,6 +1,3 @@
-0.9.11 (Zope 2.11 edition)
-- Bugfix: installPackage was tied to the ZopeLite layer.
-
 0.9.10 (Zope 2.11 edition)
 - Switched to Zope3 interfaces.
 - Removed broken profiler support.

Modified: Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/VERSION.txt
===
--- Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/VERSION.txt  
2008-10-27 22:34:04 UTC (rev 92639)
+++ Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/VERSION.txt  
2008-10-27 23:12:13 UTC (rev 92640)
@@ -1 +1 @@
-ZopeTestCase 0.9.11
+ZopeTestCase 0.9.10

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/ Repair changelog faux pas.

[Stefan H. Holek]

Log message for revision 92641:
  Repair changelog faux pas.
  

Changed:
  U   Zope/branches/2.11/doc/CHANGES.txt
  U   Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt

-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===
--- Zope/branches/2.11/doc/CHANGES.txt  2008-10-27 23:12:13 UTC (rev 92640)
+++ Zope/branches/2.11/doc/CHANGES.txt  2008-10-27 23:18:32 UTC (rev 92641)
@@ -44,6 +44,7 @@
   - Launchpad #262313: respect the 'Expand macros when editing' flag
 when editing a page template through the ZMI
 
+  - Testing.ZopeTestCase: installPackage was tied to the ZopeLite layer.
 
   Zope 2.11.1 (2008/07/17)
 

Modified: Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
===
--- Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt  
2008-10-27 23:12:13 UTC (rev 92640)
+++ Zope/branches/2.11/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt  
2008-10-27 23:18:32 UTC (rev 92641)
@@ -1,3 +1,5 @@
+[Later changes are logged in Zope's CHANGES.txt]
+
 0.9.10 (Zope 2.11 edition)
 - Switched to Zope3 interfaces.
 - Removed broken profiler support.

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Repair changelog mishap.

[Stefan H. Holek]

Log message for revision 92643:
  Repair changelog mishap.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2008-10-27 23:19:49 UTC (rev 92642)
+++ Zope/trunk/doc/CHANGES.txt  2008-10-27 23:39:00 UTC (rev 92643)
@@ -222,6 +222,8 @@
   - Ensure that response header values cannot embed CRLF pairs, which
 violate the HTTP spec (RFC 2616).
 
+  - Testing.ZopeTestCase: installPackage was tied to the ZopeLite layer.
+
   - Launchpad #280334: Fixed problem with 'timeout'
 argument/attribute missing in testbrowser tests.
 

Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt  2008-10-27 
23:19:49 UTC (rev 92642)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt  2008-10-27 
23:39:00 UTC (rev 92643)
@@ -1,3 +1,5 @@
+[Later changes are logged in Zope's CHANGES.txt]
+
 0.9.10 (Zope 2.11 edition)
 - Switched to Zope3 interfaces.
 - Removed broken profiler support.

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/setup.py Fix script locations for ZODB 3.7.3.

[Stefan H. Holek]

Log message for revision 92411:
  Fix script locations for ZODB 3.7.3.

Changed:
  U   Zope/branches/2.10/setup.py

-=-
Modified: Zope/branches/2.10/setup.py
===
--- Zope/branches/2.10/setup.py 2008-10-20 20:39:38 UTC (rev 92410)
+++ Zope/branches/2.10/setup.py 2008-10-21 08:08:12 UTC (rev 92411)
@@ -504,21 +504,34 @@
 author=AUTHOR,
 
 data_files=installed_data_files,
-scripts=[utilities/mkzeoinstance.py, utilities/mkzopeinstance.py,
- utilities/check_catalog.py, utilities/load_site.py,
- utilities/requestprofiler.py, utilities/zpasswd.py,
- utilities/copyzopeskel.py, utilities/reindex_catalog.py,
- utilities/compilezpy.py, utilities/decompilezpy.py,
- utilities/ZODBTools/timeout.py, 
utilities/ZODBTools/analyze.py,
- utilities/ZODBTools/checkbtrees.py, 
utilities/ZODBTools/fsdump.py,
- utilities/ZODBTools/fsrefs.py , utilities/ZODBTools/fstail.py,
- utilities/ZODBTools/fstest.py, utilities/ZODBTools/migrate.py,
- utilities/ZODBTools/netspace.py, 
utilities/ZODBTools/parsezeolog.py,
- utilities/ZODBTools/repozo.py, utilities/ZODBTools/space.py,
- utilities/ZODBTools/timeout.py, 
utilities/ZODBTools/zeopack.py,
- utilities/ZODBTools/zeoqueue.py, 
utilities/ZODBTools/zeoreplay.py,
- utilities/ZODBTools/zeoserverlog.py, 
utilities/ZODBTools/zeoup.py,
+scripts=[utilities/mkzeoinstance.py,
+ utilities/mkzopeinstance.py,
+ utilities/check_catalog.py,
+ utilities/load_site.py,
+ utilities/requestprofiler.py,
+ utilities/zpasswd.py,
+ utilities/copyzopeskel.py,
+ utilities/reindex_catalog.py,
+ utilities/compilezpy.py,
+ utilities/decompilezpy.py,
+ utilities/ZODBTools/analyze.py,
+ utilities/ZODBTools/checkbtrees.py,
+ utilities/ZODBTools/fsdump.py,
+ utilities/ZODBTools/fsrefs.py ,
+ utilities/ZODBTools/fstail.py,
+ utilities/ZODBTools/fstest.py,
+ utilities/ZODBTools/migrate.py,
+ utilities/ZODBTools/netspace.py,
  utilities/ZODBTools/zodbload.py,
+ utilities/ZODBTools/repozo.py,
+ utilities/ZODBTools/space.py,
+ lib/python/ZEO/scripts/timeout.py,
+ lib/python/ZEO/scripts/parsezeolog.py,
+ lib/python/ZEO/scripts/zeopack.py,
+ lib/python/ZEO/scripts/zeoqueue.py,
+ lib/python/ZEO/scripts/zeoreplay.py,
+ lib/python/ZEO/scripts/zeoserverlog.py,
+ lib/python/ZEO/scripts/zeoup.py,
  test.py],
 distclass=ZopeDistribution,
 )

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/utilities/ Fix ZODBTools external so Zope 2.10 builds again.

[Stefan H. Holek]

Log message for revision 92395:
  Fix ZODBTools external so Zope 2.10 builds again.

Changed:
  _U  Zope/branches/2.10/utilities/

-=-

Property changes on: Zope/branches/2.10/utilities
___
Name: svn:externals
   - ZODBTools svn://svn.zope.org/repos/main/ZODB/tags/3.7.3/src/scripts

   + ZODBTools svn://svn.zope.org/repos/main/ZODB/tags/3.7.3/src/ZODB/scripts


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/Zope-2_8-branch/lib/python/Products/PythonScripts/patches.py Make the monkey-patch work with Python 2.3.

[Stefan H. Holek]

Log message for revision 90577:
  Make the monkey-patch work with Python 2.3.

Changed:
  U   Zope/branches/Zope-2_8-branch/lib/python/Products/PythonScripts/patches.py

-=-
Modified: 
Zope/branches/Zope-2_8-branch/lib/python/Products/PythonScripts/patches.py
===
--- Zope/branches/Zope-2_8-branch/lib/python/Products/PythonScripts/patches.py  
2008-08-29 12:10:04 UTC (rev 90576)
+++ Zope/branches/Zope-2_8-branch/lib/python/Products/PythonScripts/patches.py  
2008-08-29 12:16:07 UTC (rev 90577)
@@ -95,6 +95,7 @@
 
 
 import encodings
+import encodings.aliases # Python 2.3
 encodings._aliases = encodings.aliases.aliases
 encodings.search_function.func_code = search_function.func_code
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py Don't tie installPackage to a layer.

[Stefan H. Holek]

Log message for revision 89897:
  Don't tie installPackage to a layer.

Changed:
  U   Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py

-=-
Modified: Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py
===
--- Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py  
2008-08-15 21:25:00 UTC (rev 89896)
+++ Zope/branches/2.11/lib/python/Testing/ZopeTestCase/ZopeLite.py  
2008-08-15 21:52:31 UTC (rev 89897)
@@ -189,9 +189,8 @@
 '''Checks if a package has been registered with five:registerPackage.'''
 return name in [m.__name__ for m in getattr(Products, 
'_registered_packages', [])]
 
[EMAIL PROTECTED]
 def installPackage(name, quiet=0):
-'''Installs a registered Python package at layer setup time.'''
+'''Installs a registered Python package.'''
 quiet = 1 # Ignore argument
 _installPackage(name, quiet)
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py Merged 2.11 branch r89897 into the trunk.

[Stefan H. Holek]

Log message for revision 89898:
  Merged 2.11 branch r89897 into the trunk.
  
  Don't tie installPackage to a layer.
  

Changed:
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py

-=-
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py  2008-08-15 
21:52:31 UTC (rev 89897)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py  2008-08-15 
21:56:53 UTC (rev 89898)
@@ -189,9 +189,8 @@
 '''Checks if a package has been registered with five:registerPackage.'''
 return name in [m.__name__ for m in getattr(Products, 
'_registered_packages', [])]
 
[EMAIL PROTECTED]
 def installPackage(name, quiet=0):
-'''Installs a registered Python package at layer setup time.'''
+'''Installs a registered Python package.'''
 quiet = 1 # Ignore argument
 _installPackage(name, quiet)
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/Testing/ZopeTestCase/doc/ Version bump.

[Stefan H. Holek]

Log message for revision 89900:
  Version bump.

Changed:
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/doc/VERSION.txt

-=-
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt  2008-08-15 
22:24:30 UTC (rev 89899)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt  2008-08-15 
22:26:55 UTC (rev 89900)
@@ -1,3 +1,6 @@
+0.9.11 (Zope 2.12 edition)
+- Bugfix: installPackage was tied to the ZopeLite layer.
+
 0.9.10 (Zope 2.11 edition)
 - Switched to Zope3 interfaces.
 - Removed broken profiler support.

Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/doc/VERSION.txt
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/doc/VERSION.txt  2008-08-15 
22:24:30 UTC (rev 89899)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/doc/VERSION.txt  2008-08-15 
22:26:55 UTC (rev 89900)
@@ -1 +1 @@
-ZopeTestCase 0.9.10
+ZopeTestCase 0.9.11

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/ Changed 'fast_listen' zope.conf option to 'fast-listen'.

[Stefan H. Holek]

Log message for revision 87178:
  Changed 'fast_listen' zope.conf option to 'fast-listen'.
  

Changed:
  U   Zope/branches/2.11/doc/CHANGES.txt
  U   Zope/branches/2.11/lib/python/ZServer/component.xml
  U   Zope/branches/2.11/skel/etc/zope.conf.in

-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===
--- Zope/branches/2.11/doc/CHANGES.txt  2008-06-05 19:18:42 UTC (rev 87177)
+++ Zope/branches/2.11/doc/CHANGES.txt  2008-06-06 08:34:21 UTC (rev 87178)
@@ -12,6 +12,11 @@
 interfaces (on import of the Interface package).  That package
 is already gone on the trunk.
 
+Bugs Fixed
+
+  - Fixed against-the-rules zope.conf option 'fast_listen' to read
+'fast-listen' (dash, not underscore).
+
   Zope 2.11 rc 1 (2008/05/08)
 
 Bugs Fixed

Modified: Zope/branches/2.11/lib/python/ZServer/component.xml
===
--- Zope/branches/2.11/lib/python/ZServer/component.xml 2008-06-05 19:18:42 UTC 
(rev 87177)
+++ Zope/branches/2.11/lib/python/ZServer/component.xml 2008-06-06 08:34:21 UTC 
(rev 87178)
@@ -19,10 +19,10 @@
  receive WebDAV source responses to GET requests.
/description
  /key
- key name=fast_listen datatype=boolean default=on
+ key name=fast-listen datatype=boolean default=on
description
- Defines wether the http server should listen to requests immediately
- or only after zope is ready to run
+ Defines whether the HTTP server should listen for requests
+ immediately or only after Zope is ready to run.
/description
  /key
  key name=use-wsgi datatype=boolean default=off /

Modified: Zope/branches/2.11/skel/etc/zope.conf.in
===
--- Zope/branches/2.11/skel/etc/zope.conf.in2008-06-05 19:18:42 UTC (rev 
87177)
+++ Zope/branches/2.11/skel/etc/zope.conf.in2008-06-06 08:34:21 UTC (rev 
87178)
@@ -975,8 +975,7 @@
   #
   # To defer the opening of the HTTP socket until the end of the 
   # startup phase: 
-  # fast_listen false
-  #
+  # fast-listen off
 /http-server
 
 # Examples:

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Merged 2.11 branch r87177:87178 into the trunk.

[Stefan H. Holek]

Log message for revision 87179:
  Merged 2.11 branch r87177:87178 into the trunk.
  
  Changed 'fast_listen' zope.conf option to 'fast-listen'.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/ZServer/component.xml
  U   Zope/trunk/skel/etc/zope.conf.in

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2008-06-06 08:34:21 UTC (rev 87178)
+++ Zope/trunk/doc/CHANGES.txt  2008-06-06 08:39:11 UTC (rev 87179)
@@ -198,6 +198,9 @@
 
 Bugs Fixed
 
+  - Fixed against-the-rules zope.conf option 'fast_listen' to read
+'fast-listen' (dash, not underscore).
+
   - Switch to branch of 'zope.testbrowser' external which suppresses
 over-the-wire tests.
 

Modified: Zope/trunk/lib/python/ZServer/component.xml
===
--- Zope/trunk/lib/python/ZServer/component.xml 2008-06-06 08:34:21 UTC (rev 
87178)
+++ Zope/trunk/lib/python/ZServer/component.xml 2008-06-06 08:39:11 UTC (rev 
87179)
@@ -19,10 +19,10 @@
  receive WebDAV source responses to GET requests.
/description
  /key
- key name=fast_listen datatype=boolean default=on
+ key name=fast-listen datatype=boolean default=on
description
- Defines wether the http server should listen to requests immediately
- or only after zope is ready to run
+ Defines whether the HTTP server should listen for requests
+ immediately or only after Zope is ready to run.
/description
  /key
  key name=use-wsgi datatype=boolean default=off /

Modified: Zope/trunk/skel/etc/zope.conf.in
===
--- Zope/trunk/skel/etc/zope.conf.in2008-06-06 08:34:21 UTC (rev 87178)
+++ Zope/trunk/skel/etc/zope.conf.in2008-06-06 08:39:11 UTC (rev 87179)
@@ -975,8 +975,7 @@
   #
   # To defer the opening of the HTTP socket until the end of the 
   # startup phase: 
-  # fast_listen false
-  #
+  # fast-listen off
 /http-server
 
 # Examples:

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/zope/ Port testbrowser downgrade from trunk to 2.11 branch.

[Stefan H. Holek]

Log message for revision 83330:
  Port testbrowser downgrade from trunk to 2.11 branch.
  

Changed:
  _U  Zope/branches/2.11/lib/python/zope/

-=-

Property changes on: Zope/branches/2.11/lib/python/zope
___
Name: svn:externals
   - annotation   
svn://svn.zope.org/repos/main/zope.annotation/tags/3.4.0/src/zope/annotation
cachedescriptors 
svn://svn.zope.org/repos/main/zope.cachedescriptors/tags/3.4.0/src/zope/cachedescriptors
component
svn://svn.zope.org/repos/main/zope.component/tags/3.4.0/src/zope/component
configuration
svn://svn.zope.org/repos/main/zope.configuration/tags/3.4.0/src/zope/configuration
contentprovider  
svn://svn.zope.org/repos/main/zope.contentprovider/tags/3.4.0/src/zope/contentprovider
contenttype  
svn://svn.zope.org/repos/main/zope.contenttype/tags/3.4.0/src/zope/contenttype
copypastemove
svn://svn.zope.org/repos/main/zope.copypastemove/tags/3.4.0/src/zope/copypastemove
datetime 
svn://svn.zope.org/repos/main/zope.datetime/tags/3.4.0/src/zope/datetime
decorator
svn://svn.zope.org/repos/main/zope.decorator/tags/3.4.0/src/zope/decorator
deferredimport   
svn://svn.zope.org/repos/main/zope.deferredimport/tags/3.4.0/src/zope/deferredimport
deprecation  
svn://svn.zope.org/repos/main/zope.deprecation/tags/3.4.0/src/zope/deprecation
documenttemplate 
svn://svn.zope.org/repos/main/zope.documenttemplate/tags/3.4.0/src/zope/documenttemplate
dottedname   
svn://svn.zope.org/repos/main/zope.dottedname/tags/3.4.2/src/zope/dottedname
dublincore   
svn://svn.zope.org/repos/main/zope.dublincore/tags/3.4.0/src/zope/dublincore
error
svn://svn.zope.org/repos/main/zope.error/tags/3.5.1/src/zope/error
event
svn://svn.zope.org/repos/main/zope.event/tags/3.4.0/src/zope/event
exceptions   
svn://svn.zope.org/repos/main/zope.exceptions/tags/3.4.0/src/zope/exceptions
filerepresentation   
svn://svn.zope.org/repos/main/zope.filerepresentation/tags/3.4.0/src/zope/filerepresentation
formlib  
svn://svn.zope.org/repos/main/zope.formlib/tags/3.4.0/src/zope/formlib
hookable 
svn://svn.zope.org/repos/main/zope.hookable/tags/3.4.0/src/zope/hookable
i18nmessageid
svn://svn.zope.org/repos/main/zope.i18nmessageid/tags/3.4.3/src/zope/i18nmessageid
i18n 
svn://svn.zope.org/repos/main/zope.i18n/tags/3.4.0/src/zope/i18n
index
svn://svn.zope.org/repos/main/zope.index/tags/3.4.1/src/zope/index
interface
svn://svn.zope.org/repos/main/zope.interface/tags/3.4.0/src/zope/interface
lifecycleevent   
svn://svn.zope.org/repos/main/zope.lifecycleevent/tags/3.4.0/src/zope/lifecycleevent
location 
svn://svn.zope.org/repos/main/zope.location/tags/3.4.0/src/zope/location
minmax   
svn://svn.zope.org/repos/main/zope.minmax/tags/1.0/src/zope/minmax
modulealias  
svn://svn.zope.org/repos/main/zope.modulealias/tags/3.4.0/src/zope/modulealias
pagetemplate 
svn://svn.zope.org/repos/main/zope.pagetemplate/tags/3.4.0/src/zope/pagetemplate
proxy
svn://svn.zope.org/repos/main/zope.proxy/tags/3.4.0/src/zope/proxy
publisher
svn://svn.zope.org/repos/main/zope.publisher/tags/3.4.1/src/zope/publisher
rdb  
svn://svn.zope.org/repos/main/zope.rdb/tags/3.4.0/src/zope/rdb
schema   
svn://svn.zope.org/repos/main/zope.schema/tags/3.4.0/src/zope/schema
security 
svn://svn.zope.org/repos/main/zope.security/tags/3.4.0/src/zope/security
sequencesort 
svn://svn.zope.org/repos/main/zope.sequencesort/tags/3.4.0/src/zope/sequencesort
sendmail 
svn://svn.zope.org/repos/main/zope.sendmail/tags/3.4.0/src/zope/sendmail
server   
svn://svn.zope.org/repos/main/zope.server/tags/3.4.1/src/zope/server
session  
svn://svn.zope.org/repos/main/zope.session/tags/3.4.1/src/zope/session
size 
svn://svn.zope.org/repos/main/zope.size/tags/3.4.0/src/zope/size
securitypolicy   
svn://svn.zope.org/repos/main/zope.securitypolicy/tags/3.4.0/src/zope/securitypolicy
   
structuredtext   
svn://svn.zope.org/repos/main/zope.structuredtext/tags/3.4.0/src/zope/structuredtext
tales
svn://svn.zope.org/repos/main/zope.tales/tags/3.4.0/src/zope/tales
tal  
svn://svn.zope.org/repos/main/zope.tal/tags/3.4.0/src/zope/tal
testbrowser  
svn://svn.zope.org/repos/main/zope.testbrowser/tags/3.4.2/src/zope/testbrowser
testing  
svn://svn.zope.org/repos/main/zope.testing/tags/3.5.1/src/zope/testing
thread   
svn://svn.zope.org/repos/main/zope.thread/tags/3.4/src/zope/thread
traversing   
svn://svn.zope.org/repos/main/zope.traversing/tags/3.4.0/src/zope/traversing
viewlet  
svn://svn.zope.org/repos/main/zope.viewlet/tags/3.4.0/src/zope/viewlet
wfmc   

[Zope-Checkins] SVN: Zope/trunk/ Testing.ZopeTestCase: Introduced a ZopeLite test layer, making it

[Stefan H. Holek]

Log message for revision 80864:
  Testing.ZopeTestCase: Introduced a ZopeLite test layer, making it
  possible to mix ZTC and non-ZTC tests much more freely.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/__init__.py
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/base.py
  A   Zope/trunk/lib/python/Testing/ZopeTestCase/layer.py
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/testShoppingCart.py
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/testWebserver.py
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/testZODBCompat.py
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/utils.py
  U   
Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/testLayerExtraction.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2007-10-13 16:02:33 UTC (rev 80863)
+++ Zope/trunk/doc/CHANGES.txt  2007-10-13 16:15:38 UTC (rev 80864)
@@ -71,6 +71,9 @@
 
 Features added
 
+  - Testing.ZopeTestCase: Introduced a ZopeLite test layer, making it
+possible to mix ZTC and non-ZTC tests much more freely.
+
   - Testing/custom_zodb.py: added support use a different storage other
 than DemoStorage. A dedicated FileStorage can be mount by setting the
 $TEST_FILESTORAGE environment variable to a custom Data.fs file.  A 

Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py  2007-10-13 
16:02:33 UTC (rev 80863)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/ZopeLite.py  2007-10-13 
16:15:38 UTC (rev 80864)
@@ -26,6 +26,7 @@
 
 
 import os, sys, time
+import layer
 
 # Allow code to tell it is run by the test framework
 os.environ['ZOPETESTCASE'] = '1'
@@ -105,7 +106,12 @@
 
 _patched = False
 
[EMAIL PROTECTED]
 def _apply_patches():
+# Do not patch a running Zope
+if Zope2._began_startup:
+return
+
 # Avoid expensive product import
 def null_import_products(): pass
 OFS.Application.import_products = null_import_products
@@ -126,10 +132,18 @@
 global _patched
 _patched = True
 
-# Do not patch a running Zope
-if not Zope2._began_startup:
-_apply_patches()
+_apply_patches()
 
+_theApp = None
+
[EMAIL PROTECTED]
+def _startup():
+global _theApp
+_theApp = Zope2.app()
+
+# Start ZopeLite
+_startup()
+
 # Allow test authors to install Zope products into the test environment. Note
 # that installProduct() must be called at module level -- never from tests.
 from OFS.Application import get_folder_permissions, get_products
@@ -137,7 +151,6 @@
 from OFS.Folder import Folder
 import Products
 
-_theApp = Zope2.app()
 _installedProducts = {}
 _installedPackages = {}
 
@@ -145,7 +158,13 @@
 '''Checks if a product can be found along Products.__path__'''
 return name in [n[1] for n in get_products()]
 
[EMAIL PROTECTED]
 def installProduct(name, quiet=0):
+'''Installs a Zope product at layer setup time.'''
+quiet = 1 # Ignore argument
+_installProduct(name, quiet)
+
+def _installProduct(name, quiet=0):
 '''Installs a Zope product.'''
 start = time.time()
 meta_types = []
@@ -170,8 +189,14 @@
 '''Checks if a package has been registered with five:registerPackage.'''
 return name in [m.__name__ for m in getattr(Products, 
'_registered_packages', [])]
 
[EMAIL PROTECTED]
 def installPackage(name, quiet=0):
-'''Installs a registered Python package like a Zope product.'''
+'''Installs a registered Python package at layer setup time.'''
+quiet = 1 # Ignore argument
+_installPackage(name, quiet)
+
+def _installPackage(name, quiet=0):
+'''Installs a registered Python package.'''
 start = time.time()
 if _patched and not _installedPackages.has_key(name):
 for module, init_func in getattr(Products, '_packages_to_initialize', 
[]):
@@ -187,28 +212,9 @@
 else:
 if not quiet: _print('Installing %s ... NOT FOUND\n' % name)
 
-def _load_control_panel():
-# Loading the Control_Panel of an existing ZODB may take
-# a while; print another dot if it does.
-start = time.time()
-max = (start - _start) / 4
-_exec('_theApp.Control_Panel')
-_theApp.Control_Panel
-if (time.time() - start)  max:
-_write('.')
+installProduct('PluginIndexes', 1)  # Must install first
+installProduct('OFSP', 1)
 
-def _install_products():
-installProduct('PluginIndexes', 1)  # Must install first
-installProduct('OFSP', 1)
-#installProduct('ExternalMethod', 1)
-#installProduct('ZSQLMethods', 1)
-#installProduct('ZGadflyDA', 1)
-#installProduct('MIMETools', 1)
-#installProduct('MailHost', 1)
-
-_load_control_panel()
-_install_products()
-
 # So people can use ZopeLite.app()
 app = Zope2.app
 debug = Zope2.debug

[Zope-Checkins] SVN: Zope/branches/shh-2.11-zopelitelayer/ Get rid of now obsolete branch.

[Stefan H. Holek]

Log message for revision 80865:
  Get rid of now obsolete branch.
  

Changed:
  D   Zope/branches/shh-2.11-zopelitelayer/

-=-
___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/shh-2.11-zopelitelayer/ Create branch for working on a ZopeLite layer.

[Stefan H. Holek]

Log message for revision 80449:
  Create branch for working on a ZopeLite layer.
  

Changed:
  A   Zope/branches/shh-2.11-zopelitelayer/

-=-
Copied: Zope/branches/shh-2.11-zopelitelayer (from rev 80448, Zope/trunk)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/tags/1.5.6/ Tagged Five 1.5.6 at r80396.

[Stefan H. Holek]

Log message for revision 80397:
  Tagged Five 1.5.6 at r80396.
  

Changed:
  A   Products.Five/tags/1.5.6/

-=-
Copied: Products.Five/tags/1.5.6 (from rev 80396, Products.Five/branches/1.5)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Products/ Stitched Five 1.5.6 into Zope 2.10 branch.

[Stefan H. Holek]

Log message for revision 80398:
  Stitched Five 1.5.6 into Zope 2.10 branch.
  

Changed:
  _U  Zope/branches/2.10/lib/python/Products/

-=-

Property changes on: Zope/branches/2.10/lib/python/Products
___
Name: svn:externals
   - Fivesvn://svn.zope.org/repos/main/Products.Five/tags/1.5.5

   + Fivesvn://svn.zope.org/repos/main/Products.Five/tags/1.5.6


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/tags/1.5.6/version.txt Update version.txt after the fact. Oops.

[Stefan H. Holek]

Log message for revision 80400:
  Update version.txt after the fact. Oops.
  

Changed:
  U   Products.Five/tags/1.5.6/version.txt

-=-
Modified: Products.Five/tags/1.5.6/version.txt
===
--- Products.Five/tags/1.5.6/version.txt2007-09-29 15:19:50 UTC (rev 
80399)
+++ Products.Five/tags/1.5.6/version.txt2007-09-29 15:31:58 UTC (rev 
80400)
@@ -1 +1 @@
-Five 1.5.5
+Five 1.5.6

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/testBaseTestCase.py Reset module-level globals before each test (backported from trunk).

[Stefan H. Holek]

Log message for revision 79848:
  Reset module-level globals before each test (backported from trunk).
  

Changed:
  U   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/testBaseTestCase.py

-=-
Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/testBaseTestCase.py
===
--- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/testBaseTestCase.py  
2007-09-23 11:49:54 UTC (rev 79847)
+++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/testBaseTestCase.py  
2007-09-23 15:00:09 UTC (rev 79848)
@@ -405,6 +405,7 @@
 _sentinel1.append('__del__')
 
 def afterSetUp(self):
+_sentinel1[:] = []
 self.anApp = base.app()
 self.anApp.REQUEST._hold(self.Held())
 
@@ -422,6 +423,7 @@
 _sentinel2.append('__del__')
 
 def afterSetUp(self):
+_sentinel2[:] = []
 self.app.REQUEST._hold(self.Held())
 
 def testClearClosesRequest(self):
@@ -438,6 +440,7 @@
 _sentinel3.append('__del__')
 
 def afterSetUp(self):
+_sentinel3[:] = []
 self.app.REQUEST._hold(self.Held())
 
 def testClearClosesRequest(self):

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/App/dtml/manage_page_style.css.dtml Remove border from image-links.

[Stefan H. Holek]

Log message for revision 79696:
  Remove border from image-links.
  

Changed:
  U   Zope/trunk/lib/python/App/dtml/manage_page_style.css.dtml

-=-
Modified: Zope/trunk/lib/python/App/dtml/manage_page_style.css.dtml
===
--- Zope/trunk/lib/python/App/dtml/manage_page_style.css.dtml   2007-09-16 
15:49:09 UTC (rev 79695)
+++ Zope/trunk/lib/python/App/dtml/manage_page_style.css.dtml   2007-09-16 
16:53:42 UTC (rev 79696)
@@ -44,6 +44,10 @@
   color: #99;
 }
 
+a img {
+  border: 0;
+}
+
 p {
   font-family: Verdana, Helvetica, sans-serif;
   font-size: 10pt;

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/App/dtml/manage_page_style.css.dtml Remove border from image-links.

[Stefan H. Holek]

Log message for revision 79697:
  Remove border from image-links.
  

Changed:
  U   Zope/branches/2.10/lib/python/App/dtml/manage_page_style.css.dtml

-=-
Modified: Zope/branches/2.10/lib/python/App/dtml/manage_page_style.css.dtml
===
--- Zope/branches/2.10/lib/python/App/dtml/manage_page_style.css.dtml   
2007-09-16 16:53:42 UTC (rev 79696)
+++ Zope/branches/2.10/lib/python/App/dtml/manage_page_style.css.dtml   
2007-09-16 16:54:06 UTC (rev 79697)
@@ -44,6 +44,10 @@
   color: #99;
 }
 
+a img {
+  border: 0;
+}
+
 p {
   font-family: Verdana, Helvetica, sans-serif;
   font-size: 10pt;

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.4/ Prepare Five 1.4.4.

[Stefan H. Holek]

Log message for revision 78510:
  Prepare Five 1.4.4.
  

Changed:
  U   Products.Five/branches/1.4/CHANGES.txt
  U   Products.Five/branches/1.4/version.txt

-=-
Modified: Products.Five/branches/1.4/CHANGES.txt
===
--- Products.Five/branches/1.4/CHANGES.txt  2007-07-31 22:52:38 UTC (rev 
78509)
+++ Products.Five/branches/1.4/CHANGES.txt  2007-07-31 22:53:19 UTC (rev 
78510)
@@ -2,6 +2,17 @@
 Five Changes
 
 
+Five 1.4.4 (2006-07-31)
+===
+
+Bugfixes
+
+
+* ObjectCopiedEvent was not dispatched to sublocations.
+  (http://www.zope.org/Collectors/Zope/2307)
+
+  This change requires Zope 2.9.8 or higher.
+
 Five 1.4.3 (2006-06-25)
 ===
 

Modified: Products.Five/branches/1.4/version.txt
===
--- Products.Five/branches/1.4/version.txt  2007-07-31 22:52:38 UTC (rev 
78509)
+++ Products.Five/branches/1.4/version.txt  2007-07-31 22:53:19 UTC (rev 
78510)
@@ -1 +1 @@
-Five 1.4.3
+Five 1.4.4

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Collector #1306: Missing acquisition context on local roles screen.

[Stefan H. Holek]

Log message for revision 77296:
  Collector #1306: Missing acquisition context on local roles screen.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/AccessControl/Role.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2007-07-02 10:02:38 UTC (rev 77295)
+++ Zope/trunk/doc/CHANGES.txt  2007-07-02 10:12:03 UTC (rev 77296)
@@ -102,6 +102,8 @@
 
 Bugs Fixed
 
+  - Collector #1306: Missing acquisition context on local roles screen.
+
   - Collector #2153: Supporting unquoted cookies with spaces.
 
   - The REQUEST no longer accepts holds after it has been closed.

Modified: Zope/trunk/lib/python/AccessControl/Role.py
===
--- Zope/trunk/lib/python/AccessControl/Role.py 2007-07-02 10:02:38 UTC (rev 
77295)
+++ Zope/trunk/lib/python/AccessControl/Role.py 2007-07-02 10:12:03 UTC (rev 
77296)
@@ -407,11 +407,12 @@
 if mlu  0: raise OverflowError
 un = getattr(aclu, 'user_names', _notfound)
 if un is not _notfound:
+un = aclu.__of__(item).user_names # rewrap
 unl = un()
 # maxlistusers of 0 is list all
 if len(unl)  mlu and mlu != 0:
 raise OverflowError
-for name in un():
+for name in unl:
 dict[name]=1
 item = getattr(item, 'aq_parent', _notfound)
 if item is _notfound:

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/ Merged trunk r77296 into 2.10 branch.

[Stefan H. Holek]

Log message for revision 77297:
  Merged trunk r77296 into 2.10 branch.
  
  Collector #1306: Missing acquisition context on local roles screen.
  

Changed:
  U   Zope/branches/2.10/doc/CHANGES.txt
  U   Zope/branches/2.10/lib/python/AccessControl/Role.py

-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===
--- Zope/branches/2.10/doc/CHANGES.txt  2007-07-02 10:12:03 UTC (rev 77296)
+++ Zope/branches/2.10/doc/CHANGES.txt  2007-07-02 10:14:18 UTC (rev 77297)
@@ -8,6 +8,8 @@
 
 Bugs fixed
 
+  - Collector #1306: Missing acquisition context on local roles screen.
+
   - Collector #2153: Supporting unquoted cookies with spaces.
 
   - The REQUEST no longer accepts holds after it has been closed.

Modified: Zope/branches/2.10/lib/python/AccessControl/Role.py
===
--- Zope/branches/2.10/lib/python/AccessControl/Role.py 2007-07-02 10:12:03 UTC 
(rev 77296)
+++ Zope/branches/2.10/lib/python/AccessControl/Role.py 2007-07-02 10:14:18 UTC 
(rev 77297)
@@ -345,11 +345,12 @@
 if mlu  0: raise OverflowError
 un = getattr(aclu, 'user_names', _notfound)
 if un is not _notfound:
+un = aclu.__of__(item).user_names # rewrap
 unl = un()
 # maxlistusers of 0 is list all
 if len(unl)  mlu and mlu != 0:
 raise OverflowError
-for name in un():
+for name in unl:
 dict[name]=1
 item = getattr(item, 'aq_parent', _notfound)
 if item is _notfound:

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.9/ Merged trunk r77296 into 2.9 branch.

[Stefan H. Holek]

Log message for revision 77298:
  Merged trunk r77296 into 2.9 branch.
  
  Collector #1306: Missing acquisition context on local roles screen.
  

Changed:
  U   Zope/branches/2.9/doc/CHANGES.txt
  U   Zope/branches/2.9/lib/python/AccessControl/Role.py

-=-
Modified: Zope/branches/2.9/doc/CHANGES.txt
===
--- Zope/branches/2.9/doc/CHANGES.txt   2007-07-02 10:14:18 UTC (rev 77297)
+++ Zope/branches/2.9/doc/CHANGES.txt   2007-07-02 10:16:05 UTC (rev 77298)
@@ -8,6 +8,8 @@
 
Bugs fixed
 
+  - Collector #1306: Missing acquisition context on local roles screen.
+
   - Collector #2153: Supporting unquoted cookies with spaces.
 
   - Collector #2295: Comments in PythonScripts could lead to syntax

Modified: Zope/branches/2.9/lib/python/AccessControl/Role.py
===
--- Zope/branches/2.9/lib/python/AccessControl/Role.py  2007-07-02 10:14:18 UTC 
(rev 77297)
+++ Zope/branches/2.9/lib/python/AccessControl/Role.py  2007-07-02 10:16:05 UTC 
(rev 77298)
@@ -341,11 +341,12 @@
 if mlu  0: raise OverflowError
 un = getattr(aclu, 'user_names', _notfound)
 if un is not _notfound:
+un = aclu.__of__(item).user_names # rewrap
 unl = un()
 # maxlistusers of 0 is list all
 if len(unl)  mlu and mlu != 0:
 raise OverflowError
-for name in un():
+for name in unl:
 dict[name]=1
 item = getattr(item, 'aq_parent', _notfound)
 if item is _notfound:

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.9/ Merged 2.10 branch r77227:77228 into 2.9 branch.

[Stefan H. Holek]

Log message for revision 77299:
  Merged 2.10 branch r77227:77228 into 2.9 branch.
  
  The REQUEST should not accept holds after it has been closed.
  

Changed:
  U   Zope/branches/2.9/doc/CHANGES.txt
  U   Zope/branches/2.9/lib/python/ZPublisher/BaseRequest.py
  U   Zope/branches/2.9/lib/python/ZPublisher/tests/testBaseRequest.py

-=-
Modified: Zope/branches/2.9/doc/CHANGES.txt
===
--- Zope/branches/2.9/doc/CHANGES.txt   2007-07-02 10:16:05 UTC (rev 77298)
+++ Zope/branches/2.9/doc/CHANGES.txt   2007-07-02 10:42:14 UTC (rev 77299)
@@ -10,6 +10,8 @@
 
   - Collector #1306: Missing acquisition context on local roles screen.
 
+  - The REQUEST no longer accepts holds after it has been closed.
+
   - Collector #2153: Supporting unquoted cookies with spaces.
 
   - Collector #2295: Comments in PythonScripts could lead to syntax

Modified: Zope/branches/2.9/lib/python/ZPublisher/BaseRequest.py
===
--- Zope/branches/2.9/lib/python/ZPublisher/BaseRequest.py  2007-07-02 
10:16:05 UTC (rev 77298)
+++ Zope/branches/2.9/lib/python/ZPublisher/BaseRequest.py  2007-07-02 
10:42:14 UTC (rev 77299)
@@ -506,7 +506,8 @@
 def _hold(self, object):
 Hold a reference to an object to delay it's destruction until mine
 
-self._held=self._held+(object,)
+if self._held is not None:
+self._held=self._held+(object,)
 
 def exec_callables(callables):
 result = None

Modified: Zope/branches/2.9/lib/python/ZPublisher/tests/testBaseRequest.py
===
--- Zope/branches/2.9/lib/python/ZPublisher/tests/testBaseRequest.py
2007-07-02 10:16:05 UTC (rev 77298)
+++ Zope/branches/2.9/lib/python/ZPublisher/tests/testBaseRequest.py
2007-07-02 10:42:14 UTC (rev 77299)
@@ -247,7 +247,18 @@
 self.assertRaises(NotFound, r.traverse, 'folder/simpleSet')
 self.assertRaises(NotFound, r.traverse, 'folder/simpleFrozenSet')
 
+def test_hold_after_close(self):
+# Request should no longer accept holds after it has been closed
+r = self.makeBaseRequest()
+r._hold(lambda x: None)
+self.assertEqual(len(r._held), 1)
+r.close()
+# No more holding from now on
+self.assertEqual(r._held, None)
+r._hold(lambda x: None)
+self.assertEqual(r._held, None)
 
+
 import zope.interface
 import zope.component
 import zope.testing.cleanup

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/ The REQUEST should not accept holds after it has been closed.

[Stefan H. Holek]

Log message for revision 77228:
  The REQUEST should not accept holds after it has been closed.
  

Changed:
  U   Zope/branches/2.10/doc/CHANGES.txt
  U   Zope/branches/2.10/lib/python/ZPublisher/BaseRequest.py
  U   Zope/branches/2.10/lib/python/ZPublisher/tests/testBaseRequest.py

-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===
--- Zope/branches/2.10/doc/CHANGES.txt  2007-06-29 09:21:26 UTC (rev 77227)
+++ Zope/branches/2.10/doc/CHANGES.txt  2007-06-29 09:49:45 UTC (rev 77228)
@@ -8,6 +8,8 @@
 
 Bugs fixed
 
+  - The REQUEST no longer accepts holds after it has been closed.
+
   - Collector #1441: WebDAV compatibility with Windows Web Folders
 restored by adding a configuration variable that controls the
 sending of the non-standard MS-Author-Via and Public

Modified: Zope/branches/2.10/lib/python/ZPublisher/BaseRequest.py
===
--- Zope/branches/2.10/lib/python/ZPublisher/BaseRequest.py 2007-06-29 
09:21:26 UTC (rev 77227)
+++ Zope/branches/2.10/lib/python/ZPublisher/BaseRequest.py 2007-06-29 
09:49:45 UTC (rev 77228)
@@ -634,7 +634,8 @@
 def _hold(self, object):
 Hold a reference to an object to delay it's destruction until mine
 
-self._held=self._held+(object,)
+if self._held is not None:
+self._held=self._held+(object,)
 
 def exec_callables(callables):
 result = None

Modified: Zope/branches/2.10/lib/python/ZPublisher/tests/testBaseRequest.py
===
--- Zope/branches/2.10/lib/python/ZPublisher/tests/testBaseRequest.py   
2007-06-29 09:21:26 UTC (rev 77227)
+++ Zope/branches/2.10/lib/python/ZPublisher/tests/testBaseRequest.py   
2007-06-29 09:49:45 UTC (rev 77228)
@@ -247,6 +247,17 @@
 self.assertRaises(NotFound, r.traverse, 'folder/simpleSet')
 self.assertRaises(NotFound, r.traverse, 'folder/simpleFrozenSet')
 
+def test_hold_after_close(self):
+# Request should no longer accept holds after it has been closed
+r = self.makeBaseRequest()
+r._hold(lambda x: None)
+self.assertEqual(len(r._held), 1)
+r.close()
+# No more holding from now on
+self.assertEqual(r._held, None)
+r._hold(lambda x: None)
+self.assertEqual(r._held, None)
+
 from ZPublisher import NotFound
 
 import zope.interface

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Merged 2.10 branch r77227:77228 into the trunk.

[Stefan H. Holek]

Log message for revision 77233:
  Merged 2.10 branch r77227:77228 into the trunk.
  
  The REQUEST should not accept holds after it has been closed.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/ZPublisher/BaseRequest.py
  U   Zope/trunk/lib/python/ZPublisher/tests/testBaseRequest.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2007-06-29 10:11:35 UTC (rev 77232)
+++ Zope/trunk/doc/CHANGES.txt  2007-06-29 10:12:02 UTC (rev 77233)
@@ -102,7 +102,8 @@
 
 Bugs Fixed
 
- .working
+  - The REQUEST no longer accepts holds after it has been closed.
+
   - Five.browser.metaconfigure.page didn't protect names from interface
 superclasses (http://www.zope.org/Collectors/Zope/2333)
 

Modified: Zope/trunk/lib/python/ZPublisher/BaseRequest.py
===
--- Zope/trunk/lib/python/ZPublisher/BaseRequest.py 2007-06-29 10:11:35 UTC 
(rev 77232)
+++ Zope/trunk/lib/python/ZPublisher/BaseRequest.py 2007-06-29 10:12:02 UTC 
(rev 77233)
@@ -634,7 +634,8 @@
 def _hold(self, object):
 Hold a reference to an object to delay it's destruction until mine
 
-self._held=self._held+(object,)
+if self._held is not None:
+self._held=self._held+(object,)
 
 def exec_callables(callables):
 result = None

Modified: Zope/trunk/lib/python/ZPublisher/tests/testBaseRequest.py
===
--- Zope/trunk/lib/python/ZPublisher/tests/testBaseRequest.py   2007-06-29 
10:11:35 UTC (rev 77232)
+++ Zope/trunk/lib/python/ZPublisher/tests/testBaseRequest.py   2007-06-29 
10:12:02 UTC (rev 77233)
@@ -247,6 +247,17 @@
 self.assertRaises(NotFound, r.traverse, 'folder/simpleSet')
 self.assertRaises(NotFound, r.traverse, 'folder/simpleFrozenSet')
 
+def test_hold_after_close(self):
+# Request should no longer accept holds after it has been closed
+r = self.makeBaseRequest()
+r._hold(lambda x: None)
+self.assertEqual(len(r._held), 1)
+r.close()
+# No more holding from now on
+self.assertEqual(r._held, None)
+r._hold(lambda x: None)
+self.assertEqual(r._held, None)
+
 from ZPublisher import NotFound
 
 import zope.interface

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/Testing/ZopeTestCase/PortalTestCase.py Call setupCurrentSkin with REQUEST argument to shut up a deprecation warning.

[Stefan H. Holek]

Log message for revision 77005:
  Call setupCurrentSkin with REQUEST argument to shut up a deprecation warning.
  

Changed:
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/PortalTestCase.py

-=-
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/PortalTestCase.py
===
--- Zope/trunk/lib/python/Testing/ZopeTestCase/PortalTestCase.py
2007-06-24 08:57:54 UTC (rev 77004)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/PortalTestCase.py
2007-06-24 10:25:12 UTC (rev 77005)
@@ -100,7 +100,10 @@
 self.portal.clearCurrentSkin()
 else: # CMF 1.4
 self.portal._v_skindata = None
-self.portal.setupCurrentSkin()
+try:
+self.portal.setupCurrentSkin(self.app.REQUEST)
+except TypeError:
+self.portal.setupCurrentSkin()
 
 # Portal interface
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/PortalTestCase.py Call setupCurrentSkin with REQUEST argument to shut up a deprecation warning.

[Stefan H. Holek]

Log message for revision 77006:
  Call setupCurrentSkin with REQUEST argument to shut up a deprecation warning.
  

Changed:
  U   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/PortalTestCase.py

-=-
Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/PortalTestCase.py
===
--- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/PortalTestCase.py
2007-06-24 10:25:12 UTC (rev 77005)
+++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/PortalTestCase.py
2007-06-24 10:25:28 UTC (rev 77006)
@@ -100,7 +100,10 @@
 self.portal.clearCurrentSkin()
 else: # CMF 1.4
 self.portal._v_skindata = None
-self.portal.setupCurrentSkin()
+try:
+self.portal.setupCurrentSkin(self.app.REQUEST)
+except TypeError:
+self.portal.setupCurrentSkin()
 
 # Portal interface
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ Add hasPackage and installPackage functions for dealing with products

[Stefan H. Holek]

Log message for revision 76966:
  Add hasPackage and installPackage functions for dealing with products
  registered via five:registerPackage.
  

Changed:
  U   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ZopeLite.py
  U   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/__init__.py
  U   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
  A   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/testpackage/
  A   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/testpackage/__init__.py
  A   
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py

-=-
Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ZopeLite.py
===
--- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ZopeLite.py  
2007-06-23 08:40:00 UTC (rev 76965)
+++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ZopeLite.py  
2007-06-23 08:40:48 UTC (rev 76966)
@@ -26,7 +26,6 @@
 
 
 import os, sys, time
-import transaction
 
 # Allow code to tell it is run by the test framework
 os.environ['ZOPETESTCASE'] = '1'
@@ -133,62 +132,60 @@
 
 # Allow test authors to install Zope products into the test environment. Note
 # that installProduct() must be called at module level -- never from tests.
-from OFS.Application import get_folder_permissions, get_products, 
install_product
+from OFS.Application import get_folder_permissions, get_products
+from OFS.Application import install_product, install_package
 from OFS.Folder import Folder
 import Products
 
 _theApp = Zope2.app()
 _installedProducts = {}
+_installedPackages = {}
 
 def hasProduct(name):
 '''Checks if a product can be found along Products.__path__'''
 return name in [n[1] for n in get_products()]
 
-def installProduct(name, quiet=0, package=False):
+def installProduct(name, quiet=0):
 '''Installs a Zope product.'''
 start = time.time()
 meta_types = []
 if _patched and not _installedProducts.has_key(name):
-if package:
-# Processing of products-as-packages can be simpler; also check
-# whether this has been registered with five:registerPackage /
-# and has not been loaded.
-for module_, init_func in getattr(Products, 
'_packages_to_initialize', []):
-if module_.__name__ == name:
-if not quiet: _print('Installing %s ... ' % name)
-try:
-product = App.Product.initializeProduct(module_, 
-
module_.__name__, 
-
module_.__path__[0],
-_theApp)
+for priority, product_name, index, product_dir in get_products():
+if product_name == name:
+if not quiet: _print('Installing %s ... ' % product_name)
+# We want to fail immediately if a product throws an exception
+# during install, so we set the raise_exc flag.
+install_product(_theApp, product_dir, product_name, meta_types,
+get_folder_permissions(), raise_exc=1)
+_installedProducts[product_name] = 1
+Products.meta_types = Products.meta_types + tuple(meta_types)
+Globals.InitializeClass(Folder)
+if not quiet: _print('done (%.3fs)\n' % (time.time() - start))
+break
+else:
+if name != 'SomeProduct':   # Ignore the skeleton tests :-P
+if not quiet: _print('Installing %s ... NOT FOUND\n' % name)
 
-product.package_name = module_.__name__
+def hasPackage(name):
+'''Checks if a package has been registered with five:registerPackage.'''
+return name in [m.__name__ for m, f in Products._packages_to_initialize]
 
-if init_func is not None:
-newContext = 
App.ProductContext.ProductContext(product, app, module_)
-init_func(newContext)
-finally:
-transaction.commit()
-
-Globals.InitializeClass(Folder)
-if not quiet: _print('done (%.3fs)\n' % (time.time() - 
start))
-break
+def installPackage(name, quiet=0):
+'''Installs a registered Python package like a Zope product.'''
+start = time.time()
+if _patched and not _installedPackages.has_key(name):
+for module, init_func in Products._packages_to_initialize:
+if module.__name__ == name:
+if not quiet: _print('Installing %s ... ' % module.__name__)
+# We want to fail immediately if a package throws an exception
+# during install, so we set the raise_exc flag.
+

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/OFS/Application.py Extract package installation code into its own function so it can be reused.

[Stefan H. Holek]

Log message for revision 76965:
  Extract package installation code into its own function so it can be reused.
  

Changed:
  U   Zope/branches/2.10/lib/python/OFS/Application.py

-=-
Modified: Zope/branches/2.10/lib/python/OFS/Application.py
===
--- Zope/branches/2.10/lib/python/OFS/Application.py2007-06-23 08:13:35 UTC 
(rev 76964)
+++ Zope/branches/2.10/lib/python/OFS/Application.py2007-06-23 08:40:00 UTC 
(rev 76965)
@@ -633,21 +633,9 @@
 install_product(app, product_dir, product_name, meta_types,
 folder_permissions, raise_exc=debug_mode)
 
-# Delayed install of products-as-packages
-for module_, init_func in getattr(Products, '_packages_to_initialize', []):
-try:
-product = App.Product.initializeProduct(module_, 
-module_.__name__, 
-module_.__path__[0],
-app)
-
-product.package_name = module_.__name__
-
-if init_func is not None:
-newContext = ProductContext(product, app, module_)
-init_func(newContext)
-finally:
-transaction.commit()
+# Delayed install of packages-as-products
+for module, init_func in Products._packages_to_initialize:
+install_package(app, module, init_func, raise_exc=debug_mode)
 Products._packages_to_initialize = []
 
 Products.meta_types=Products.meta_types+tuple(meta_types)
@@ -878,6 +866,34 @@
 if raise_exc:
 raise
 
+
+def install_package(app, module, init_func, raise_exc=False, log_exc=True):
+Installs a Python package like a product.
+try:
+product = App.Product.initializeProduct(module,
+module.__name__,
+module.__path__[0],
+app)
+product.package_name = module.__name__
+if init_func is not None:
+newContext = ProductContext(product, app, module)
+init_func(newContext)
+
+if not doInstall():
+transaction.abort()
+else:
+transaction.get().note('Installed package %s' % module.__name__)
+transaction.commit()
+
+except:
+if log_exc:
+LOG.error(Couldn't install %s % module.__name__,
+  exc_info=True)
+transaction.abort()
+if raise_exc:
+raise
+
+
 def install_standards(app):
 # Check to see if we've already done this before
 # Don't do it twice (Casey)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Products/ Stitched Five 1.5.4 tag into Zope 2.10 branch.

[Stefan H. Holek]

Log message for revision 76970:
  Stitched Five 1.5.4 tag into Zope 2.10 branch.
  

Changed:
  _U  Zope/branches/2.10/lib/python/Products/

-=-

Property changes on: Zope/branches/2.10/lib/python/Products
___
Name: svn:externals
   - Fivesvn://svn.zope.org/repos/main/Products.Five/tags/1.5.3

   + Fivesvn://svn.zope.org/repos/main/Products.Five/tags/1.5.4


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/tags/1.5.4/ Tagged Five 1.5.4 at r76968.

[Stefan H. Holek]

Log message for revision 76969:
  Tagged Five 1.5.4 at r76968.
  

Changed:
  A   Products.Five/tags/1.5.4/

-=-
Copied: Products.Five/tags/1.5.4 (from rev 76968, Products.Five/branches/1.5)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ hasPackage consulted the wrong registry, oops.

[Stefan H. Holek]

Log message for revision 76984:
  hasPackage consulted the wrong registry, oops.
  

Changed:
  U   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ZopeLite.py
  U   
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py

-=-
Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ZopeLite.py
===
--- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ZopeLite.py  
2007-06-23 12:14:40 UTC (rev 76983)
+++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ZopeLite.py  
2007-06-23 12:16:34 UTC (rev 76984)
@@ -168,7 +168,7 @@
 
 def hasPackage(name):
 '''Checks if a package has been registered with five:registerPackage.'''
-return name in [m.__name__ for m, f in Products._packages_to_initialize]
+return name in [m.__name__ for m in getattr(Products, 
'_registered_packages', [])]
 
 def installPackage(name, quiet=0):
 '''Installs a registered Python package like a Zope product.'''

Modified: 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py
===
--- 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py
  2007-06-23 12:14:40 UTC (rev 76983)
+++ 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testPackageAsProduct.py
  2007-06-23 12:16:34 UTC (rev 76984)
@@ -74,6 +74,11 @@
   True
ZopeTestCase.close(app)
 
+hasPackage still returns True
+
+   ZopeTestCase.hasPackage('testpackage')
+  True
+
 Clean up
 
import testpackage

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ Provide access to test globs in doctest setUp and tearDown.

[Stefan H. Holek]

Log message for revision 76991:
  Provide access to test globs in doctest setUp and tearDown.
  

Changed:
  U   Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
  U   
Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py
  U   
Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py
  U   
Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py

-=-
Modified: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
===
--- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt   
2007-06-23 17:08:40 UTC (rev 76990)
+++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt   
2007-06-23 17:26:25 UTC (rev 76991)
@@ -14,6 +14,7 @@
   publish_module(). Thanks to Andreas Zeidler.
 - Fixed doctestsuite factory to copy layers from test_class to the suite.
   Thanks to Whit Morris.
+- Provide access to test globs in doctest setUp and tearDown.
 
 0.9.8 (Zope 2.8 edition)
 - Renamed 'doctest' package to 'zopedoctest' because of name-shadowing

Modified: 
Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py
===
--- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py 
2007-06-23 17:08:40 UTC (rev 76990)
+++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py 
2007-06-23 17:26:25 UTC (rev 76991)
@@ -261,6 +261,7 @@
 if hasattr(test_instance, 'portal'):
 test.globs['portal'] = test_instance.portal
 test.globs['portal_name'] = test_instance.portal.getId()
+test_instance.globs = test.globs
 if kwsetUp is not None:
 kwsetUp(test_instance)
 

Modified: 
Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py
===
--- 
Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py
  2007-06-23 17:08:40 UTC (rev 76990)
+++ 
Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py
  2007-06-23 17:26:25 UTC (rev 76991)
@@ -38,6 +38,9 @@
 Content-Type: text/plain; charset=...
 BLANKLINE
 index
+
+ foo
+1
 '''
 self.folder.addDTMLDocument('index_html', file='index')
 
@@ -55,7 +58,9 @@
 /dtml-in'''
 self.folder.addDTMLMethod('show_cookies', file=show_cookies)
 
+self.globs['foo'] = 1
 
+
 def test_suite():
 return TestSuite((
 FunctionalDocTestSuite(setUp=setUp),

Modified: 
Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py
===
--- 
Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py
2007-06-23 17:08:40 UTC (rev 76990)
+++ 
Zope/branches/2.9/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py
2007-06-23 17:26:25 UTC (rev 76991)
@@ -29,8 +29,12 @@
 
  'object' in folder.objectIds()
 True
+
+ foo
+1
 '''
 self.folder.manage_addFolder('object', '')
+self.globs['foo'] = 1
 
 
 def test_suite():

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/ Provide access to test globs in doctest setUp and tearDown.

[Stefan H. Holek]

Log message for revision 76990:
  Provide access to test globs in doctest setUp and tearDown.
  

Changed:
  U   Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
  U   
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py
  U   
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py
  U   
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py

-=-
Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt
===
--- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt  
2007-06-23 17:08:16 UTC (rev 76989)
+++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/doc/CHANGES.txt  
2007-06-23 17:08:40 UTC (rev 76990)
@@ -16,6 +16,7 @@
   Thanks to Whit Morris.
 - Added hasPackage and installPackage functions for dealing with products
   registered via five:registerPackage.
+- Provide access to test globs in doctest setUp and tearDown.
 
 0.9.8 (Zope 2.8 edition)
 - Renamed 'doctest' package to 'zopedoctest' because of name-shadowing

Modified: 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py
===
--- 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py
2007-06-23 17:08:16 UTC (rev 76989)
+++ 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py
2007-06-23 17:08:40 UTC (rev 76990)
@@ -253,6 +253,7 @@
 if hasattr(test_instance, 'portal'):
 test.globs['portal'] = test_instance.portal
 test.globs['portal_name'] = test_instance.portal.getId()
+test_instance.globs = test.globs
 if kwsetUp is not None:
 kwsetUp(test_instance)
 

Modified: 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py
===
--- 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py
 2007-06-23 17:08:16 UTC (rev 76989)
+++ 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py
 2007-06-23 17:08:40 UTC (rev 76990)
@@ -38,6 +38,9 @@
 Content-Type: text/plain; charset=...
 BLANKLINE
 index
+
+ foo
+1
 '''
 self.folder.addDTMLDocument('index_html', file='index')
 
@@ -55,7 +58,9 @@
 /dtml-in'''
 self.folder.addDTMLMethod('show_cookies', file=show_cookies)
 
+self.globs['foo'] = 1
 
+
 def test_suite():
 return TestSuite((
 FunctionalDocTestSuite(setUp=setUp),

Modified: 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py
===
--- 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py
   2007-06-23 17:08:16 UTC (rev 76989)
+++ 
Zope/branches/2.10/lib/python/Testing/ZopeTestCase/zopedoctest/testZopeDocTest.py
   2007-06-23 17:08:40 UTC (rev 76990)
@@ -12,7 +12,7 @@
 ##
 Example Zope doctest
 
-$Id: testZopeDocTest.py,v 1.2 2005/03/26 18:07:08 shh42 Exp $
+$Id$
 
 
 import os, sys
@@ -29,8 +29,12 @@
 
  'object' in folder.objectIds()
 True
+
+ foo
+1
 '''
 self.folder.manage_addFolder('object', '')
+self.globs['foo'] = 1
 
 
 def test_suite():

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.3/tests/event.txt Add event.txt test that I missed last time.

[Stefan H. Holek]

Log message for revision 76874:
  Add event.txt test that I missed last time.
  

Changed:
  U   Products.Five/branches/1.3/tests/event.txt

-=-
Modified: Products.Five/branches/1.3/tests/event.txt
===
--- Products.Five/branches/1.3/tests/event.txt  2007-06-21 06:46:21 UTC (rev 
76873)
+++ Products.Five/branches/1.3/tests/event.txt  2007-06-21 07:27:23 UTC (rev 
76874)
@@ -60,6 +60,7 @@
 
from zope.app.event.interfaces import IObjectEvent
from zope.app.container.interfaces import IObjectMovedEvent
+   from zope.app.event.interfaces import IObjectCopiedEvent
from OFS.interfaces import IObjectWillBeMovedEvent
from OFS.interfaces import IObjectClonedEvent
from OFS.interfaces import IItem
@@ -67,6 +68,7 @@
   ... print event.__class__.__name__, object.getId()
def printObjectEventExceptSome(object, event):
   ... if (IObjectMovedEvent.providedBy(event) or
+  ... IObjectCopiedEvent.providedBy(event) or
   ... IObjectWillBeMovedEvent.providedBy(event) or
   ... IObjectClonedEvent.providedBy(event)):
   ... return
@@ -74,6 +76,7 @@
 
from zope.component import provideHandler
provideHandler(printObjectEvent, (IItem, IObjectMovedEvent))
+   provideHandler(printObjectEvent, (IItem, IObjectCopiedEvent))
provideHandler(printObjectEvent, (IItem, IObjectWillBeMovedEvent))
provideHandler(printObjectEvent, (IItem, IObjectClonedEvent))
provideHandler(printObjectEventExceptSome, (None, IObjectEvent))
@@ -134,6 +137,7 @@
 
res = folder.manage_clone(folder.marine, 'tank')
   ObjectCopiedEvent tank
+  ObjectCopiedEvent dog
   ObjectWillBeAddedEvent tank
   ObjectWillBeAddedEvent dog
   ObjectAddedEvent tank
@@ -283,6 +287,7 @@
 
res = folder.manage_clone(folder.pluto, 'mickey')
   ObjectCopiedEvent mickey
+  ObjectCopiedEvent donald
   ObjectWillBeAddedEvent mickey
   ObjectWillBeAddedEvent donald
   ObjectAddedEvent mickey
@@ -415,6 +420,7 @@
 
res = folder.manage_clone(folder.firefly, 'serenity')
   ObjectCopiedEvent serenity
+  ObjectCopiedEvent mel
   ObjectWillBeAddedEvent serenity
   ObjectWillBeAddedEvent mel
   ObjectAddedEvent serenity

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/tags/1.3.9/ Retagging Five 1.3.9.

[Stefan H. Holek]

Log message for revision 76875:
  Retagging Five 1.3.9.
  

Changed:
  D   Products.Five/tags/1.3.9/

-=-
___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/tags/1.3.9/ Tagged Five 1.3.9 at r76875.

[Stefan H. Holek]

Log message for revision 76876:
  Tagged Five 1.3.9 at r76875.
  

Changed:
  A   Products.Five/tags/1.3.9/

-=-
Copied: Products.Five/tags/1.3.9 (from rev 76875, Products.Five/branches/1.3)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.4-objectcopiedeventdispatcher/ Park fix for #2307 on a branch until Zope 2.9.8 has arrived.

[Stefan H. Holek]

Log message for revision 76908:
  Park fix for #2307 on a branch until Zope 2.9.8 has arrived.
  

Changed:
  A   Products.Five/branches/1.4-objectcopiedeventdispatcher/

-=-
Copied: Products.Five/branches/1.4-objectcopiedeventdispatcher (from rev 76906, 
Products.Five/branches/1.4)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.4/ Revert fix for #2307 (for now) as half of Plonistan is running Zope 2.9.7

[Stefan H. Holek]

Log message for revision 76909:
  Revert fix for #2307 (for now) as half of Plonistan is running Zope 2.9.7
  with Five 1.4 branch -- and they are complaining noisily.
  

Changed:
  U   Products.Five/branches/1.4/CHANGES.txt
  U   Products.Five/branches/1.4/event.zcml
  U   Products.Five/branches/1.4/tests/event.txt

-=-
Modified: Products.Five/branches/1.4/CHANGES.txt
===
--- Products.Five/branches/1.4/CHANGES.txt  2007-06-21 17:51:02 UTC (rev 
76908)
+++ Products.Five/branches/1.4/CHANGES.txt  2007-06-21 17:56:43 UTC (rev 
76909)
@@ -2,15 +2,12 @@
 Five Changes
 
 
-Five 1.4.3 (svn/unreleased)
-===
+Five 1.4.3 (unreleased)
+===
 
 Bugfixes
 
 
-* ObjectCopiedEvent was not dispatched to sublocations.
-  (http://www.zope.org/Collectors/Zope/2307)
-
 * Relaxed requirements for context of browser.pagetemplatefile's 
   ZopeTwoPageTemplateFile, to reduce barriers for testing renderability
   of views which use them. (http://www.zope.org/Collectors/Zope/2327)

Modified: Products.Five/branches/1.4/event.zcml
===
--- Products.Five/branches/1.4/event.zcml   2007-06-21 17:51:02 UTC (rev 
76908)
+++ Products.Five/branches/1.4/event.zcml   2007-06-21 17:56:43 UTC (rev 
76909)
@@ -33,12 +33,4 @@
   handler=OFS.subscribers.dispatchObjectClonedEvent
   /
 
-  !-- dispatch IObjectCopiedEvent with top-down semantics --
-
-  subscriber
-  for=OFS.interfaces.IItem
-   zope.app.event.interfaces.IObjectCopiedEvent
-  handler=OFS.subscribers.dispatchObjectCopiedEvent
-  /
-
 /configure

Modified: Products.Five/branches/1.4/tests/event.txt
===
--- Products.Five/branches/1.4/tests/event.txt  2007-06-21 17:51:02 UTC (rev 
76908)
+++ Products.Five/branches/1.4/tests/event.txt  2007-06-21 17:56:43 UTC (rev 
76909)
@@ -60,7 +60,6 @@
 
from zope.app.event.interfaces import IObjectEvent
from zope.app.container.interfaces import IObjectMovedEvent
-   from zope.app.event.interfaces import IObjectCopiedEvent
from OFS.interfaces import IObjectWillBeMovedEvent
from OFS.interfaces import IObjectClonedEvent
from OFS.interfaces import IItem
@@ -68,7 +67,6 @@
   ... print event.__class__.__name__, object.getId()
def printObjectEventExceptSome(object, event):
   ... if (IObjectMovedEvent.providedBy(event) or
-  ... IObjectCopiedEvent.providedBy(event) or
   ... IObjectWillBeMovedEvent.providedBy(event) or
   ... IObjectClonedEvent.providedBy(event)):
   ... return
@@ -76,7 +74,6 @@
 
from zope.component import provideHandler
provideHandler(printObjectEvent, (IItem, IObjectMovedEvent))
-   provideHandler(printObjectEvent, (IItem, IObjectCopiedEvent))
provideHandler(printObjectEvent, (IItem, IObjectWillBeMovedEvent))
provideHandler(printObjectEvent, (IItem, IObjectClonedEvent))
provideHandler(printObjectEventExceptSome, (None, IObjectEvent))
@@ -137,7 +134,6 @@
 
res = folder.manage_clone(folder.marine, 'tank')
   ObjectCopiedEvent tank
-  ObjectCopiedEvent dog
   ObjectWillBeAddedEvent tank
   ObjectWillBeAddedEvent dog
   ObjectAddedEvent tank
@@ -287,7 +283,6 @@
 
res = folder.manage_clone(folder.pluto, 'mickey')
   ObjectCopiedEvent mickey
-  ObjectCopiedEvent donald
   ObjectWillBeAddedEvent mickey
   ObjectWillBeAddedEvent donald
   ObjectAddedEvent mickey
@@ -420,7 +415,6 @@
 
res = folder.manage_clone(folder.firefly, 'serenity')
   ObjectCopiedEvent serenity
-  ObjectCopiedEvent mel
   ObjectWillBeAddedEvent serenity
   ObjectWillBeAddedEvent mel
   ObjectAddedEvent serenity

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.9/ Collector #2307: ObjectCopiedEvent not dispatched to sublocations.

[Stefan H. Holek]

Log message for revision 76827:
  Collector #2307: ObjectCopiedEvent not dispatched to sublocations.
  

Changed:
  U   Zope/branches/2.9/doc/CHANGES.txt
  U   Zope/branches/2.9/lib/python/OFS/subscribers.py
  U   Zope/branches/2.9/lib/python/OFS/tests/testCopySupportEvents.py

-=-
Modified: Zope/branches/2.9/doc/CHANGES.txt
===
--- Zope/branches/2.9/doc/CHANGES.txt   2007-06-20 06:35:41 UTC (rev 76826)
+++ Zope/branches/2.9/doc/CHANGES.txt   2007-06-20 09:53:38 UTC (rev 76827)
@@ -8,6 +8,8 @@
 
Bugs fixed
 
+  - Collector #2307: ObjectCopiedEvent not dispatched to sublocations.
+
   - Fixed ZClass test breakage due to non-pickleability of
 'zope.interface.Implements' 
 

Modified: Zope/branches/2.9/lib/python/OFS/subscribers.py
===
--- Zope/branches/2.9/lib/python/OFS/subscribers.py 2007-06-20 06:35:41 UTC 
(rev 76826)
+++ Zope/branches/2.9/lib/python/OFS/subscribers.py 2007-06-20 09:53:38 UTC 
(rev 76827)
@@ -125,7 +125,14 @@
 if OFS.interfaces.IObjectManager.providedBy(ob):
 dispatchToSublocations(ob, event)
 
+def dispatchObjectCopiedEvent(ob, event):
+Multi-subscriber for IItem + IObjectCopiedEvent.
+
+# Dispatch to sublocations
+if OFS.interfaces.IObjectManager.providedBy(ob):
+dispatchToSublocations(ob, event)
 
+
 def callManageAfterAdd(ob, item, container):
 Compatibility subscriber for manage_afterAdd.
 

Modified: Zope/branches/2.9/lib/python/OFS/tests/testCopySupportEvents.py
===
--- Zope/branches/2.9/lib/python/OFS/tests/testCopySupportEvents.py 
2007-06-20 06:35:41 UTC (rev 76826)
+++ Zope/branches/2.9/lib/python/OFS/tests/testCopySupportEvents.py 
2007-06-20 09:53:38 UTC (rev 76827)
@@ -224,7 +224,7 @@
 self.subfolder.manage_clone(self.folder.myfolder, 'myfolder')
 self.assertEqual(eventlog.called(),
 [('myfolder', 'ObjectCopiedEvent'),
- #('mydoc', 'ObjectCopiedEvent'),
+ ('mydoc', 'ObjectCopiedEvent'),
  ('myfolder', 'ObjectWillBeAddedEvent'),
  ('mydoc', 'ObjectWillBeAddedEvent'),
  ('myfolder', 'ObjectAddedEvent'),
@@ -240,7 +240,7 @@
 self.subfolder.manage_pasteObjects(cb)
 self.assertEqual(eventlog.called(),
 [('myfolder', 'ObjectCopiedEvent'),
- #('mydoc', 'ObjectCopiedEvent'),
+ ('mydoc', 'ObjectCopiedEvent'),
  ('myfolder', 'ObjectWillBeAddedEvent'),
  ('mydoc', 'ObjectWillBeAddedEvent'),
  ('myfolder', 'ObjectAddedEvent'),
@@ -282,7 +282,7 @@
 self.folder.myfolder.COPY(req, req.RESPONSE)
 self.assertEqual(eventlog.called(),
 [('myfolder', 'ObjectCopiedEvent'),
- #('mydoc', 'ObjectCopiedEvent'),
+ ('mydoc', 'ObjectCopiedEvent'),
  ('myfolder', 'ObjectWillBeAddedEvent'),
  ('mydoc', 'ObjectWillBeAddedEvent'),
  ('myfolder', 'ObjectAddedEvent'),

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.3/event.zcml Collector #2307: ObjectCopiedEvent not dispatched to sublocations.

[Stefan H. Holek]

Log message for revision 76828:
  Collector #2307: ObjectCopiedEvent not dispatched to sublocations.
  

Changed:
  U   Products.Five/branches/1.3/event.zcml

-=-
Modified: Products.Five/branches/1.3/event.zcml
===
--- Products.Five/branches/1.3/event.zcml   2007-06-20 09:53:38 UTC (rev 
76827)
+++ Products.Five/branches/1.3/event.zcml   2007-06-20 09:54:47 UTC (rev 
76828)
@@ -33,4 +33,12 @@
   handler=OFS.subscribers.dispatchObjectClonedEvent
   /
 
+  !-- dispatch IObjectCopiedEvent with top-down semantics --
+
+  subscriber
+  for=OFS.interfaces.IItem
+   zope.app.event.interfaces.IObjectCopiedEvent
+  handler=OFS.subscribers.dispatchObjectCopiedEvent
+  /
+
 /configure

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.4/event.zcml Collector #2307: ObjectCopiedEvent not dispatched to sublocations.

[Stefan H. Holek]

Log message for revision 76829:
  Collector #2307: ObjectCopiedEvent not dispatched to sublocations.
  

Changed:
  U   Products.Five/branches/1.4/event.zcml

-=-
Modified: Products.Five/branches/1.4/event.zcml
===
--- Products.Five/branches/1.4/event.zcml   2007-06-20 09:54:47 UTC (rev 
76828)
+++ Products.Five/branches/1.4/event.zcml   2007-06-20 09:57:27 UTC (rev 
76829)
@@ -33,4 +33,12 @@
   handler=OFS.subscribers.dispatchObjectClonedEvent
   /
 
+  !-- dispatch IObjectCopiedEvent with top-down semantics --
+
+  subscriber
+  for=OFS.interfaces.IItem
+   zope.app.event.interfaces.IObjectCopiedEvent
+  handler=OFS.subscribers.dispatchObjectCopiedEvent
+  /
+
 /configure

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.3/ Prepare Five 1.3.9.

[Stefan H. Holek]

Log message for revision 76830:
  Prepare Five 1.3.9.
  

Changed:
  U   Products.Five/branches/1.3/CHANGES.txt
  U   Products.Five/branches/1.3/version.txt

-=-
Modified: Products.Five/branches/1.3/CHANGES.txt
===
--- Products.Five/branches/1.3/CHANGES.txt  2007-06-20 09:57:27 UTC (rev 
76829)
+++ Products.Five/branches/1.3/CHANGES.txt  2007-06-20 10:10:16 UTC (rev 
76830)
@@ -2,9 +2,12 @@
 Five Changes
 
 
-Five 1.3.9 (unreleased)
-===
+Five 1.3.9 (svn/unreleased)
+===
 
+* ObjectCopiedEvent was not dispatched to sublocations.
+  (http://www.zope.org/Collectors/Zope/2307)
+
 * Relaxed requirements for context of browser.pagetemplatefile's 
   ZopeTwoPageTemplateFile, to reduce barriers for testing renderability
   of views which use them. (http://www.zope.org/Collectors/Zope/2327)

Modified: Products.Five/branches/1.3/version.txt
===
--- Products.Five/branches/1.3/version.txt  2007-06-20 09:57:27 UTC (rev 
76829)
+++ Products.Five/branches/1.3/version.txt  2007-06-20 10:10:16 UTC (rev 
76830)
@@ -1 +1 @@
-Five 1.3.8
+Five 1.3.9

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/tags/1.3.9/ Tagged Five 1.3.9 at r76830.

[Stefan H. Holek]

Log message for revision 76831:
  Tagged Five 1.3.9 at r76830.
  

Changed:
  A   Products.Five/tags/1.3.9/

-=-
Copied: Products.Five/tags/1.3.9 (from rev 76830, Products.Five/branches/1.3)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/Products/ Stitched Five 1.3.9 tag into Zope 2.9 branch.

[Stefan H. Holek]

Log message for revision 76832:
  Stitched Five 1.3.9 tag into Zope 2.9 branch.
  

Changed:
  _U  Zope/branches/2.9/lib/python/Products/

-=-

Property changes on: Zope/branches/2.9/lib/python/Products
___
Name: svn:externals
   - Five svn://svn.zope.org/repos/main/Products.Five/tags/1.3.8

   + Five svn://svn.zope.org/repos/main/Products.Five/tags/1.3.9


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.5/ Collector #2307: ObjectCopiedEvent not dispatched to sublocations.

[Stefan H. Holek]

Log message for revision 76598:
  Collector #2307: ObjectCopiedEvent not dispatched to sublocations.
  

Changed:
  U   Products.Five/branches/1.5/event.zcml
  U   Products.Five/branches/1.5/tests/event.txt

-=-
Modified: Products.Five/branches/1.5/event.zcml
===
--- Products.Five/branches/1.5/event.zcml   2007-06-10 21:15:48 UTC (rev 
76597)
+++ Products.Five/branches/1.5/event.zcml   2007-06-10 21:18:04 UTC (rev 
76598)
@@ -16,4 +16,7 @@
   !-- dispatch IObjectClonedEvent with top-down semantics --
   subscriber handler=OFS.subscribers.dispatchObjectClonedEvent /
 
+  !-- dispatch IObjectCopiedEvent with top-down semantics --
+  subscriber handler=OFS.subscribers.dispatchObjectCopiedEvent /
+
 /configure

Modified: Products.Five/branches/1.5/tests/event.txt
===
--- Products.Five/branches/1.5/tests/event.txt  2007-06-10 21:15:48 UTC (rev 
76597)
+++ Products.Five/branches/1.5/tests/event.txt  2007-06-10 21:18:04 UTC (rev 
76598)
@@ -57,6 +57,7 @@
 
from zope.component.interfaces import IObjectEvent, IRegistrationEvent
from zope.app.container.interfaces import IObjectMovedEvent
+   from zope.lifecycleevent.interfaces import IObjectCopiedEvent
from OFS.interfaces import IObjectWillBeMovedEvent
from OFS.interfaces import IObjectClonedEvent
from OFS.interfaces import IItem
@@ -64,6 +65,7 @@
   ... print event.__class__.__name__, object.getId()
def printObjectEventExceptSome(object, event):
   ... if (IObjectMovedEvent.providedBy(event) or
+  ... IObjectCopiedEvent.providedBy(event) or
   ... IObjectWillBeMovedEvent.providedBy(event) or
   ... IObjectClonedEvent.providedBy(event) or
   ... IRegistrationEvent.providedBy(event)):
@@ -72,6 +74,7 @@
 
from zope.component import provideHandler
provideHandler(printObjectEvent, (IItem, IObjectMovedEvent))
+   provideHandler(printObjectEvent, (IItem, IObjectCopiedEvent))
provideHandler(printObjectEvent, (IItem, IObjectWillBeMovedEvent))
provideHandler(printObjectEvent, (IItem, IObjectClonedEvent))
provideHandler(printObjectEventExceptSome, (None, IObjectEvent))
@@ -83,6 +86,7 @@
zope.component.provideAdapter(OFS.subscribers.ObjectManagerSublocations)

zope.component.provideHandler(OFS.subscribers.dispatchObjectWillBeMovedEvent)
zope.component.provideHandler(OFS.subscribers.dispatchObjectMovedEvent)
+   zope.component.provideHandler(OFS.subscribers.dispatchObjectCopiedEvent)
zope.component.provideHandler(OFS.subscribers.dispatchObjectClonedEvent)
 
 We need at least one fake deprecated method to tell the compatibility
@@ -133,6 +137,7 @@
 
res = folder.manage_clone(folder.marine, 'tank')
   ObjectCopiedEvent tank
+  ObjectCopiedEvent dog
   ObjectWillBeAddedEvent tank
   ObjectWillBeAddedEvent dog
   ObjectAddedEvent tank
@@ -282,6 +287,7 @@
 
res = folder.manage_clone(folder.pluto, 'mickey')
   ObjectCopiedEvent mickey
+  ObjectCopiedEvent donald
   ObjectWillBeAddedEvent mickey
   ObjectWillBeAddedEvent donald
   ObjectAddedEvent mickey
@@ -414,6 +420,7 @@
 
res = folder.manage_clone(folder.firefly, 'serenity')
   ObjectCopiedEvent serenity
+  ObjectCopiedEvent mel
   ObjectWillBeAddedEvent serenity
   ObjectWillBeAddedEvent mel
   ObjectAddedEvent serenity

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.5/ Prepare Five 1.5.3.

[Stefan H. Holek]

Log message for revision 76600:
  Prepare Five 1.5.3.
  

Changed:
  U   Products.Five/branches/1.5/CHANGES.txt
  U   Products.Five/branches/1.5/version.txt

-=-
Modified: Products.Five/branches/1.5/CHANGES.txt
===
--- Products.Five/branches/1.5/CHANGES.txt  2007-06-10 21:24:20 UTC (rev 
76599)
+++ Products.Five/branches/1.5/CHANGES.txt  2007-06-10 21:51:03 UTC (rev 
76600)
@@ -2,9 +2,12 @@
 Five Changes
 
 
-Five 1.5.x (svn/unreleased)
+Five 1.5.3 (svn/unreleased)
 ===
 
+* ObjectCopiedEvent was not dispatched to sublocations.
+  (http://www.zope.org/Collectors/Zope/2307)
+
 * Relaxed requirements for context of browser.pagetemplatefile's 
   ZopeTwoPageTemplateFile, to reduce barriers for testing renderability
   of views which use them. (http://www.zope.org/Collectors/Zope/2327)

Modified: Products.Five/branches/1.5/version.txt
===
--- Products.Five/branches/1.5/version.txt  2007-06-10 21:24:20 UTC (rev 
76599)
+++ Products.Five/branches/1.5/version.txt  2007-06-10 21:51:03 UTC (rev 
76600)
@@ -1 +1 @@
-Five 1.5.2
+Five 1.5.3

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/tags/1.5.3/ Tagged Five 1.5.3 at r76600.

[Stefan H. Holek]

Log message for revision 76601:
  Tagged Five 1.5.3 at r76600.
  

Changed:
  A   Products.Five/tags/1.5.3/

-=-
Copied: Products.Five/tags/1.5.3 (from rev 76600, Products.Five/branches/1.5)

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Products/ Stitched Five 1.5.3 tag into Zope 2.10 branch.

[Stefan H. Holek]

Log message for revision 76602:
  Stitched Five 1.5.3 tag into Zope 2.10 branch.
  

Changed:
  _U  Zope/branches/2.10/lib/python/Products/

-=-

Property changes on: Zope/branches/2.10/lib/python/Products
___
Name: svn:externals
   - Five
svn://svn.zope.org/repos/main/Products.Five/tags/1.5.2-plus-registerPackage-fix

   + Fivesvn://svn.zope.org/repos/main/Products.Five/tags/1.5.3


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/ImageFile.py Removed bogus executable flag.

[Stefan H. Holek]

Log message for revision 74116:
  Removed bogus executable flag.
  

Changed:
  _U  Zope/trunk/lib/python/ImageFile.py

-=-

Property changes on: Zope/trunk/lib/python/ImageFile.py
___
Name: svn:executable
   - *

___
Zope-Checkins maillist  -  [EMAIL PROTECTED]
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/OFS/tests/testCopySupportEvents.py Repair (and simplify) tests in response to

[Stefan H. Holek]

Log message for revision 74109:
  Repair (and simplify) tests in response to
  http://www.zope.org/Collectors/Zope/2308.
  

Changed:
  U   Zope/trunk/lib/python/OFS/tests/testCopySupportEvents.py

-=-
Modified: Zope/trunk/lib/python/OFS/tests/testCopySupportEvents.py
===
--- Zope/trunk/lib/python/OFS/tests/testCopySupportEvents.py2007-04-12 
14:56:25 UTC (rev 74108)
+++ Zope/trunk/lib/python/OFS/tests/testCopySupportEvents.py2007-04-12 
18:19:57 UTC (rev 74109)
@@ -15,15 +15,7 @@
 
 from zope import interface
 from zope import component
-from zope.app.container.interfaces import IObjectAddedEvent
-from zope.app.container.interfaces import IObjectMovedEvent
-from zope.app.container.interfaces import IObjectRemovedEvent
-from zope.app.container.interfaces import IContainerModifiedEvent
-from zope.lifecycleevent.interfaces import IObjectCopiedEvent
-from OFS.interfaces import IObjectWillBeAddedEvent
-from OFS.interfaces import IObjectWillBeMovedEvent
-from OFS.interfaces import IObjectWillBeRemovedEvent
-from OFS.interfaces import IObjectClonedEvent
+from zope.component.interfaces import IObjectEvent
 
 from zope.testing import cleanup
 from Products.Five import zcml
@@ -35,7 +27,7 @@
 def reset(self):
 self._called = []
 def trace(self, ob, event):
-self._called.append((ob.getId(), event))
+self._called.append((ob.getId(), event.__class__.__name__))
 def called(self):
 return self._called
 
@@ -62,57 +54,6 @@
 pass # Always allow
 
 
-def objectAddedEvent(ob, event):
-eventlog.trace(ob, 'ObjectAddedEvent')
-
-def objectCopiedEvent(ob, event):
-eventlog.trace(ob, 'ObjectCopiedEvent')
-
-def objectMovedEvent(ob, event):
-if IObjectAddedEvent.providedBy(event):
-return
-if IObjectRemovedEvent.providedBy(event):
-return
-eventlog.trace(ob, 'ObjectMovedEvent')
-
-def objectRemovedEvent(ob, event):
-eventlog.trace(ob, 'ObjectRemovedEvent')
-
-def containerModifiedEvent(ob, event):
-eventlog.trace(ob, 'ContainerModifiedEvent')
-
-def objectWillBeAddedEvent(ob, event):
-eventlog.trace(ob, 'ObjectWillBeAddedEvent')
-
-def objectWillBeMovedEvent(ob, event):
-if IObjectWillBeAddedEvent.providedBy(event):
-return
-if IObjectWillBeRemovedEvent.providedBy(event):
-return
-eventlog.trace(ob, 'ObjectWillBeMovedEvent')
-
-def objectWillBeRemovedEvent(ob, event):
-eventlog.trace(ob, 'ObjectWillBeRemovedEvent')
-
-def objectClonedEvent(ob, event):
-eventlog.trace(ob, 'ObjectClonedEvent')
-
-
-def setUpItemSubscribers(interface):
-component.provideHandler(objectAddedEvent, (interface, IObjectAddedEvent))
-component.provideHandler(objectCopiedEvent, (interface, 
IObjectCopiedEvent))
-component.provideHandler(objectMovedEvent, (interface, IObjectMovedEvent))
-component.provideHandler(objectRemovedEvent, (interface, 
IObjectRemovedEvent))
-component.provideHandler(objectWillBeAddedEvent, (interface, 
IObjectWillBeAddedEvent))
-component.provideHandler(objectWillBeMovedEvent, (interface, 
IObjectWillBeMovedEvent))
-component.provideHandler(objectWillBeRemovedEvent, (interface, 
IObjectWillBeRemovedEvent))
-component.provideHandler(objectClonedEvent, (interface, 
IObjectClonedEvent))
-
-def setUpFolderSubscribers(interface):
-setUpItemSubscribers(interface)
-component.provideHandler(containerModifiedEvent, (interface, 
IContainerModifiedEvent))
-
-
 class EventLayer:
 
 @classmethod
@@ -120,8 +61,8 @@
 cleanup.cleanUp()
 zcml._initialized = 0
 zcml.load_site()
-setUpItemSubscribers(ITestItem)
-setUpFolderSubscribers(ITestFolder)
+component.provideHandler(eventlog.trace, (ITestItem, IObjectEvent))
+component.provideHandler(eventlog.trace, (ITestFolder, IObjectEvent))
 
 @classmethod
 def tearDown(cls):
@@ -271,19 +212,26 @@
 # Reset event log
 eventlog.reset()
 
+def assertEqual(self, first, second, msg=None):
+# XXX: Compare sets as the order of event handlers cannot be
+#  relied on between objects.
+if not set(first) == set(second):
+raise self.failureException, \
+(msg or '%r != %r' % (first, second))
+
 def test_1_Clone(self):
 # Test clone
 self.subfolder.manage_clone(self.folder.myfolder, 'myfolder')
 self.assertEqual(eventlog.called(),
-[('mydoc', 'ObjectCopiedEvent'),
- ('myfolder', 'ObjectCopiedEvent'),
- ('mydoc', 'ObjectWillBeAddedEvent'),
+[('myfolder', 'ObjectCopiedEvent'),
+ ('mydoc', 'ObjectCopiedEvent'),
  ('myfolder', 'ObjectWillBeAddedEvent'),
- ('mydoc', 'ObjectAddedEvent'),
+ ('mydoc', 'ObjectWillBeAddedEvent'),
  ('myfolder', 'ObjectAddedEvent'),
+ ('mydoc', 'ObjectAddedEvent'),
  

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/OFS/tests/testCopySupportEvents.py Merged trunk r74108:74109 into 2.10 branch.

[Stefan H. Holek]

Log message for revision 74110:
  Merged trunk r74108:74109 into 2.10 branch.
  
  Repair (and simplify) tests in response to
  http://www.zope.org/Collectors/Zope/2308.
  

Changed:
  U   Zope/branches/2.10/lib/python/OFS/tests/testCopySupportEvents.py

-=-
Modified: Zope/branches/2.10/lib/python/OFS/tests/testCopySupportEvents.py
===
--- Zope/branches/2.10/lib/python/OFS/tests/testCopySupportEvents.py
2007-04-12 18:19:57 UTC (rev 74109)
+++ Zope/branches/2.10/lib/python/OFS/tests/testCopySupportEvents.py
2007-04-12 18:33:59 UTC (rev 74110)
@@ -15,15 +15,7 @@
 
 from zope import interface
 from zope import component
-from zope.app.container.interfaces import IObjectAddedEvent
-from zope.app.container.interfaces import IObjectMovedEvent
-from zope.app.container.interfaces import IObjectRemovedEvent
-from zope.app.container.interfaces import IContainerModifiedEvent
-from zope.lifecycleevent.interfaces import IObjectCopiedEvent
-from OFS.interfaces import IObjectWillBeAddedEvent
-from OFS.interfaces import IObjectWillBeMovedEvent
-from OFS.interfaces import IObjectWillBeRemovedEvent
-from OFS.interfaces import IObjectClonedEvent
+from zope.component.interfaces import IObjectEvent
 
 from zope.testing import cleanup
 from Products.Five import zcml
@@ -35,7 +27,7 @@
 def reset(self):
 self._called = []
 def trace(self, ob, event):
-self._called.append((ob.getId(), event))
+self._called.append((ob.getId(), event.__class__.__name__))
 def called(self):
 return self._called
 
@@ -62,57 +54,6 @@
 pass # Always allow
 
 
-def objectAddedEvent(ob, event):
-eventlog.trace(ob, 'ObjectAddedEvent')
-
-def objectCopiedEvent(ob, event):
-eventlog.trace(ob, 'ObjectCopiedEvent')
-
-def objectMovedEvent(ob, event):
-if IObjectAddedEvent.providedBy(event):
-return
-if IObjectRemovedEvent.providedBy(event):
-return
-eventlog.trace(ob, 'ObjectMovedEvent')
-
-def objectRemovedEvent(ob, event):
-eventlog.trace(ob, 'ObjectRemovedEvent')
-
-def containerModifiedEvent(ob, event):
-eventlog.trace(ob, 'ContainerModifiedEvent')
-
-def objectWillBeAddedEvent(ob, event):
-eventlog.trace(ob, 'ObjectWillBeAddedEvent')
-
-def objectWillBeMovedEvent(ob, event):
-if IObjectWillBeAddedEvent.providedBy(event):
-return
-if IObjectWillBeRemovedEvent.providedBy(event):
-return
-eventlog.trace(ob, 'ObjectWillBeMovedEvent')
-
-def objectWillBeRemovedEvent(ob, event):
-eventlog.trace(ob, 'ObjectWillBeRemovedEvent')
-
-def objectClonedEvent(ob, event):
-eventlog.trace(ob, 'ObjectClonedEvent')
-
-
-def setUpItemSubscribers(interface):
-component.provideHandler(objectAddedEvent, (interface, IObjectAddedEvent))
-component.provideHandler(objectCopiedEvent, (interface, 
IObjectCopiedEvent))
-component.provideHandler(objectMovedEvent, (interface, IObjectMovedEvent))
-component.provideHandler(objectRemovedEvent, (interface, 
IObjectRemovedEvent))
-component.provideHandler(objectWillBeAddedEvent, (interface, 
IObjectWillBeAddedEvent))
-component.provideHandler(objectWillBeMovedEvent, (interface, 
IObjectWillBeMovedEvent))
-component.provideHandler(objectWillBeRemovedEvent, (interface, 
IObjectWillBeRemovedEvent))
-component.provideHandler(objectClonedEvent, (interface, 
IObjectClonedEvent))
-
-def setUpFolderSubscribers(interface):
-setUpItemSubscribers(interface)
-component.provideHandler(containerModifiedEvent, (interface, 
IContainerModifiedEvent))
-
-
 class EventLayer:
 
 @classmethod
@@ -120,8 +61,8 @@
 cleanup.cleanUp()
 zcml._initialized = 0
 zcml.load_site()
-setUpItemSubscribers(ITestItem)
-setUpFolderSubscribers(ITestFolder)
+component.provideHandler(eventlog.trace, (ITestItem, IObjectEvent))
+component.provideHandler(eventlog.trace, (ITestFolder, IObjectEvent))
 
 @classmethod
 def tearDown(cls):
@@ -271,19 +212,26 @@
 # Reset event log
 eventlog.reset()
 
+def assertEqual(self, first, second, msg=None):
+# XXX: Compare sets as the order of event handlers cannot be
+#  relied on between objects.
+if not set(first) == set(second):
+raise self.failureException, \
+(msg or '%r != %r' % (first, second))
+
 def test_1_Clone(self):
 # Test clone
 self.subfolder.manage_clone(self.folder.myfolder, 'myfolder')
 self.assertEqual(eventlog.called(),
-[#('mydoc', 'ObjectCopiedEvent'),
- ('myfolder', 'ObjectCopiedEvent'),
- ('mydoc', 'ObjectWillBeAddedEvent'),
+[('myfolder', 'ObjectCopiedEvent'),
+ #('mydoc', 'ObjectCopiedEvent'),
  ('myfolder', 'ObjectWillBeAddedEvent'),
- ('mydoc', 'ObjectAddedEvent'),
+ ('mydoc', 'ObjectWillBeAddedEvent'),

[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ Merged trunk r73189:73190 into 2.9 branch.

[Stefan H. Holek]

Log message for revision 74043:
  Merged trunk r73189:73190 into 2.9 branch.
  
  Protect against setNumberOfThreads disappearing after first use.
  

Changed:
  U   Zope/branches/2.9/lib/python/Testing/ZopeTestCase/threadutils.py
  U   Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py

-=-
Modified: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/threadutils.py
===
--- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/threadutils.py
2007-04-08 23:44:28 UTC (rev 74042)
+++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/threadutils.py
2007-04-09 14:06:29 UTC (rev 74043)
@@ -22,6 +22,15 @@
 dummyLOG = StringIO()
 
 
+def setNumberOfThreads(number_of_threads):
+'''Sets number of ZServer threads.'''
+try:
+from ZServer.PubCore import setNumberOfThreads
+setNumberOfThreads(number_of_threads)
+except ImportError:
+pass
+
+
 def zserverRunner(host, port, log=None):
 '''Runs an HTTP ZServer on host:port.'''
 from ZServer import logger, asyncore

Modified: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py
===
--- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py  2007-04-08 
23:44:28 UTC (rev 74042)
+++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py  2007-04-09 
14:06:29 UTC (rev 74043)
@@ -115,7 +115,7 @@
 if _Z2HOST is None:
 _Z2HOST = '127.0.0.1'
 _Z2PORT = random.choice(range(55000, 55500))
-from ZServer import setNumberOfThreads
+from threadutils import setNumberOfThreads
 setNumberOfThreads(number_of_threads)
 from threadutils import QuietThread, zserverRunner
 t = QuietThread(target=zserverRunner, args=(_Z2HOST, _Z2PORT, log))

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/ Merged trunk r73189:73190 into 2.8 branch.

[Stefan H. Holek]

Log message for revision 74045:
  Merged trunk r73189:73190 into 2.8 branch.
  
  Protect against setNumberOfThreads disappearing after first use.
  

Changed:
  U   
Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/threadutils.py
  U   Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/utils.py

-=-
Modified: 
Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/threadutils.py
===
--- 
Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/threadutils.py
2007-04-09 14:20:09 UTC (rev 74044)
+++ 
Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/threadutils.py
2007-04-09 14:33:01 UTC (rev 74045)
@@ -13,7 +13,7 @@
 Parts of ZServer support are in this module so they can
 be imported more selectively.
 
-$Id: threadutils.py,v 1.6 2004/08/19 15:31:26 shh42 Exp $
+$Id$
 
 
 from threading import Thread
@@ -22,6 +22,15 @@
 dummyLOG = StringIO()
 
 
+def setNumberOfThreads(number_of_threads):
+'''Sets number of ZServer threads.'''
+try:
+from ZServer.PubCore import setNumberOfThreads
+setNumberOfThreads(number_of_threads)
+except ImportError:
+pass
+
+
 def zserverRunner(host, port, log=None):
 '''Runs an HTTP ZServer on host:port.'''
 from ZServer import logger, asyncore

Modified: Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/utils.py
===
--- Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/utils.py  
2007-04-09 14:20:09 UTC (rev 74044)
+++ Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/utils.py  
2007-04-09 14:33:01 UTC (rev 74045)
@@ -115,7 +115,7 @@
 if _Z2HOST is None:
 _Z2HOST = '127.0.0.1'
 _Z2PORT = random.choice(range(55000, 55500))
-from ZServer import setNumberOfThreads
+from threadutils import setNumberOfThreads
 setNumberOfThreads(number_of_threads)
 from threadutils import QuietThread, zserverRunner
 t = QuietThread(target=zserverRunner, args=(_Z2HOST, _Z2PORT, log))

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.5/ Merged trunk r74040:74041 into 1.5 branch.

[Stefan H. Holek]

Log message for revision 74046:
  Merged trunk r74040:74041 into 1.5 branch.
  
  Fix test suites.
  

Changed:
  U   Products.Five/branches/1.5/formlib/tests/test_formlib.py
  U   Products.Five/branches/1.5/tests/test_registerpackage.py

-=-
Modified: Products.Five/branches/1.5/formlib/tests/test_formlib.py
===
--- Products.Five/branches/1.5/formlib/tests/test_formlib.py2007-04-09 
14:33:01 UTC (rev 74045)
+++ Products.Five/branches/1.5/formlib/tests/test_formlib.py2007-04-09 
14:45:53 UTC (rev 74046)
@@ -22,10 +22,10 @@
 def test_suite():
 import unittest
 from Testing.ZopeTestCase import FunctionalDocFileSuite
-return unittest.TestSuite(
+return unittest.TestSuite((
 FunctionalDocFileSuite(
-'formlib.txt', package='Products.Five.formlib.tests')
-)
+'formlib.txt', package='Products.Five.formlib.tests'),
+))
 
 if __name__ == '__main__':
 framework()

Modified: Products.Five/branches/1.5/tests/test_registerpackage.py
===
--- Products.Five/branches/1.5/tests/test_registerpackage.py2007-04-09 
14:33:01 UTC (rev 74045)
+++ Products.Five/branches/1.5/tests/test_registerpackage.py2007-04-09 
14:45:53 UTC (rev 74046)
@@ -77,10 +77,9 @@
 
 
 def test_suite():
-from zope.testing.doctest import DocTestSuite
-return DocTestSuite()
-#from Testing.ZopeTestCase import ZopeDocTestSuite
-#return ZopeDocTestSuite()
+# Must use functional because registerPackage commits
+from Testing.ZopeTestCase import FunctionalDocTestSuite
+return FunctionalDocTestSuite()
 
 if __name__ == '__main__':
 framework()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins