[Checkins] SVN: zope.site/trunk/ Avoid a test dependency on zope.copypastemove by testing the correct persistent behavior of a site manager using the normal pickle module.
Hanno Schlichting
hannosch at hannosch.eu
Tue Dec 29 18:17:12 EST 2009
Log message for revision 107325:
Avoid a test dependency on zope.copypastemove by testing the correct persistent behavior of a site manager using the normal pickle module.
Changed:
U zope.site/trunk/CHANGES.txt
U zope.site/trunk/setup.py
U zope.site/trunk/src/zope/site/site.txt
U zope.site/trunk/src/zope/site/tests/test_localsitemanager.py
-=-
Modified: zope.site/trunk/CHANGES.txt
===================================================================
--- zope.site/trunk/CHANGES.txt 2009-12-29 23:03:30 UTC (rev 107324)
+++ zope.site/trunk/CHANGES.txt 2009-12-29 23:17:12 UTC (rev 107325)
@@ -2,9 +2,11 @@
CHANGES
=======
-3.8.1 (unreleased)
+3.9.0 (unreleased)
------------------
+- Avoid a test dependency on zope.copypastemove by testing the correct
+ persistent behavior of a site manager using the normal pickle module.
3.8.0 (2009-12-15)
------------------
Modified: zope.site/trunk/setup.py
===================================================================
--- zope.site/trunk/setup.py 2009-12-29 23:03:30 UTC (rev 107324)
+++ zope.site/trunk/setup.py 2009-12-29 23:17:12 UTC (rev 107325)
@@ -27,7 +27,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.site',
- version = '3.8.1dev',
+ version = '3.9.0dev',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
description='Local registries for zope component architecture',
@@ -56,8 +56,7 @@
package_dir = {'': 'src'},
namespace_packages=['zope'],
extras_require=dict(
- test=['zope.configuration',
- 'zope.copypastemove']),
+ test=['zope.configuration']),
install_requires=[
'setuptools',
'zope.annotation',
Modified: zope.site/trunk/src/zope/site/site.txt
===================================================================
--- zope.site/trunk/src/zope/site/site.txt 2009-12-29 23:03:30 UTC (rev 107324)
+++ zope.site/trunk/src/zope/site/site.txt 2009-12-29 23:17:12 UTC (rev 107325)
@@ -321,19 +321,17 @@
>>> myfolder.getSiteManager().subs
()
-Now, we make a copy of `myfolder21` and add it as `myfolder11` to
-`myfolder`:
+Make sure that our interfaces and classes are picklable:
- # Make sure that our interfaces and classes are picklable.
-
>>> import sys
>>> sys.modules['zope.site.tests'].IMyUtility = IMyUtility
>>> IMyUtility.__module__ = 'zope.site.tests'
>>> sys.modules['zope.site.tests'].MyUtility = MyUtility
>>> MyUtility.__module__ = 'zope.site.tests'
- >>> from zope.copy import copy
- >>> myfolder['myfolder11'] = copy(myfolder2['myfolder21'])
+ >>> from pickle import dumps, loads
+ >>> data = dumps(myfolder2['myfolder21'])
+ >>> myfolder['myfolder11'] = loads(data)
>>> myfolder11 = myfolder['myfolder11']
>>> myfolder11.getSiteManager().__bases__ == (myfolder.getSiteManager(), )
Modified: zope.site/trunk/src/zope/site/tests/test_localsitemanager.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_localsitemanager.py 2009-12-29 23:03:30 UTC (rev 107324)
+++ zope.site/trunk/src/zope/site/tests/test_localsitemanager.py 2009-12-29 23:17:12 UTC (rev 107325)
@@ -18,7 +18,6 @@
import unittest
from zope.interface import Interface
-from zope.copypastemove import ObjectCopier
from zope import site
from zope.site.folder import Folder
import zope.site.testing
@@ -42,12 +41,13 @@
def tearDown(self):
zope.site.testing.siteTearDown()
- def testCopy(self):
+ def testPersistence(self):
+ from pickle import dumps, loads
self.assert_(
self.root['site'].getSiteManager().getUtility(I1) is self.util)
- copier = ObjectCopier(self.root['site'])
- copier.copyTo(self.root, 'copied_site')
+ data = dumps(self.root['site'])
+ self.root['copied_site'] = loads(data)
self.assert_(
self.root['copied_site'].getSiteManager().getUtility(I1) is not self.util)
More information about the checkins
mailing list