[Checkins] SVN: z3c.sampledata/trunk/ Make tests pass after zope refactoring.
Dan Korostelev
nadako at gmail.com
Wed Feb 4 14:39:33 EST 2009
Log message for revision 96083:
Make tests pass after zope refactoring.
Changed:
U z3c.sampledata/trunk/CHANGES.txt
U z3c.sampledata/trunk/setup.py
U z3c.sampledata/trunk/src/z3c/sampledata/generator/intids.py
U z3c.sampledata/trunk/src/z3c/sampledata/generator/intids.txt
U z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.txt
U z3c.sampledata/trunk/src/z3c/sampledata/generator/principals.txt
U z3c.sampledata/trunk/src/z3c/sampledata/generator/site.py
U z3c.sampledata/trunk/src/z3c/sampledata/generator/site.txt
-=-
Modified: z3c.sampledata/trunk/CHANGES.txt
===================================================================
--- z3c.sampledata/trunk/CHANGES.txt 2009-02-04 16:37:38 UTC (rev 96082)
+++ z3c.sampledata/trunk/CHANGES.txt 2009-02-04 19:39:33 UTC (rev 96083)
@@ -13,6 +13,7 @@
- adjust zope.app.securitypolicy to zope.securitpolicy in ftesting.zcml
+- fix test after zope packages refactoring. Update imports and dependencies.
0.1.0 (2008-02-14)
------------------
Modified: z3c.sampledata/trunk/setup.py
===================================================================
--- z3c.sampledata/trunk/setup.py 2009-02-04 16:37:38 UTC (rev 96082)
+++ z3c.sampledata/trunk/setup.py 2009-02-04 19:39:33 UTC (rev 96083)
@@ -61,13 +61,13 @@
),
install_requires = [
'setuptools',
+ 'ZODB3',
+ 'zope.component',
+ 'zope.i18nmessageid',
'zope.interface',
- 'zope.component',
+ 'zope.intid',
'zope.schema',
- 'ZODB3',
- 'zope.app.container',
- 'zope.app.intid',
- 'zope.i18nmessageid'
+ 'zope.site',
],
zip_safe = False,
)
Modified: z3c.sampledata/trunk/src/z3c/sampledata/generator/intids.py
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/generator/intids.py 2009-02-04 16:37:38 UTC (rev 96082)
+++ z3c.sampledata/trunk/src/z3c/sampledata/generator/intids.py 2009-02-04 19:39:33 UTC (rev 96083)
@@ -17,21 +17,18 @@
"""
__docformat__ = "reStructuredText"
-import zope.interface
import zope.component
import zope.event
-import zope.schema
+import zope.interface
import zope.lifecycleevent
+import zope.schema
from zope.interface import implements
+from zope.intid import IntIds
+from zope.intid.interfaces import IIntIds
-from zope.app.intid import IntIds
-from zope.app.intid.interfaces import IIntIds
-
+from z3c.sampledata import _
from z3c.sampledata.interfaces import ISampleDataPlugin
-from z3c.sampledata import _
-
-
class SampleIntIds(object):
implements(ISampleDataPlugin)
Modified: z3c.sampledata/trunk/src/z3c/sampledata/generator/intids.txt
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/generator/intids.txt 2009-02-04 16:37:38 UTC (rev 96082)
+++ z3c.sampledata/trunk/src/z3c/sampledata/generator/intids.txt 2009-02-04 19:39:33 UTC (rev 96083)
@@ -20,23 +20,22 @@
... 'z3c.sampledata.site')
>>> manager = Manager('manager', '')
>>> manager.add('z3c.sampledata.site')
- >>> from zope.app.folder.folder import Folder
+ >>> from zope.site.folder import Folder
>>> infos = manager.generate(context=root,
... param={'z3c.sampledata.site':
... {'sitename':'test'}},
... seed=None)
>>> root['test']
- <zope.app.folder.folder.Folder object at ...>
+ <zope.site.folder.Folder object at ...>
Now that everything is set up we can generate the intids utility-
>>> site = root['test']
>>> generator.generate(site)
- <zope.app.intid.IntIds object at ...>
+ <zope.intid.IntIds object at ...>
>>> 'intid' in site.getSiteManager()['default']
True
>>> from zope import component
- >>> from zope.app.intid.interfaces import IIntIds
+ >>> from zope.intid.interfaces import IIntIds
>>> component.getUtility(IIntIds)
- <zope.app.intid.IntIds object at ...>
-
+ <zope.intid.IntIds object at ...>
Modified: z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.txt
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.txt 2009-02-04 16:37:38 UTC (rev 96082)
+++ z3c.sampledata/trunk/src/z3c/sampledata/generator/pau.txt 2009-02-04 19:39:33 UTC (rev 96083)
@@ -20,13 +20,13 @@
... 'z3c.sampledata.site')
>>> manager = Manager('manager', '')
>>> manager.add('z3c.sampledata.site')
- >>> from zope.app.folder.folder import Folder
+ >>> from zope.site.folder import Folder
>>> infos = manager.generate(context=root,
... param={'z3c.sampledata.site':
... {'sitename':'test'}},
... seed=None)
>>> root['test']
- <zope.app.folder.folder.Folder object at ...>
+ <zope.site.folder.Folder object at ...>
Now that everything is set up we can generate the intids utility-
Modified: z3c.sampledata/trunk/src/z3c/sampledata/generator/principals.txt
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/generator/principals.txt 2009-02-04 16:37:38 UTC (rev 96082)
+++ z3c.sampledata/trunk/src/z3c/sampledata/generator/principals.txt 2009-02-04 19:39:33 UTC (rev 96083)
@@ -25,13 +25,13 @@
>>> manager = Manager('manager', '')
>>> manager.add('z3c.sampledata.site')
>>> manager.add('z3c.sampledata.pau', contextFrom='z3c.sampledata.site')
- >>> from zope.app.folder.folder import Folder
+ >>> from zope.site.folder import Folder
>>> infos = manager.generate(context=root,
... param={'z3c.sampledata.site':
... {'sitename':'test'}},
... seed=None)
>>> root['test']
- <zope.app.folder.folder.Folder object at ...>
+ <zope.site.folder.Folder object at ...>
>>> principalDataSource = [['batlogg','Jodok Batlogg','bJB'],
... ['jukart','Juergen Kartnaller','jJK'],
Modified: z3c.sampledata/trunk/src/z3c/sampledata/generator/site.py
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/generator/site.py 2009-02-04 16:37:38 UTC (rev 96082)
+++ z3c.sampledata/trunk/src/z3c/sampledata/generator/site.py 2009-02-04 19:39:33 UTC (rev 96083)
@@ -17,22 +17,19 @@
"""
__docformat__ = "reStructuredText"
-import zope.interface
import zope.component
import zope.event
-import zope.schema
+import zope.interface
import zope.lifecycleevent
+import zope.schema
from zope.interface import implements
-from zope.app.component import hooks
+from zope.site import hooks
+from zope.site.folder import Folder
+from zope.site.site import LocalSiteManager
-from zope.app.component.site import LocalSiteManager
-from zope.app.folder.folder import Folder
-
+from z3c.sampledata import _
from z3c.sampledata.interfaces import ISampleDataPlugin
-from z3c.sampledata import _
-
-
class ISampleSiteParameters(zope.interface.Interface):
"""The parameters for the site creation."""
Modified: z3c.sampledata/trunk/src/z3c/sampledata/generator/site.txt
===================================================================
--- z3c.sampledata/trunk/src/z3c/sampledata/generator/site.txt 2009-02-04 16:37:38 UTC (rev 96082)
+++ z3c.sampledata/trunk/src/z3c/sampledata/generator/site.txt 2009-02-04 19:39:33 UTC (rev 96083)
@@ -11,11 +11,10 @@
... param={'sitename':'testsite'},
... )
>>> site
- <zope.app.folder.folder.Folder object at ...>
+ <zope.site.folder.Folder object at ...>
>>> root['testsite'] == site
True
>>> sm = site.getSiteManager()
>>> default = sm['default']
>>> default
- <zope.app.component.site.SiteManagementFolder object at ...>
-
+ <zope.site.site.SiteManagementFolder object at ...>
More information about the Checkins
mailing list