[Checkins] SVN: zope.app.testing/trunk/ Use zope.site instead of zope.app.folder, and zope.app.component.
Sylvain Viollon
sylvain at infrae.com
Fri Jan 30 12:26:52 EST 2009
Log message for revision 95595:
Use zope.site instead of zope.app.folder, and zope.app.component.
Changed:
U zope.app.testing/trunk/CHANGES.txt
U zope.app.testing/trunk/setup.py
U zope.app.testing/trunk/src/zope/app/testing/functional.py
U zope.app.testing/trunk/src/zope/app/testing/setup.py
-=-
Modified: zope.app.testing/trunk/CHANGES.txt
===================================================================
--- zope.app.testing/trunk/CHANGES.txt 2009-01-30 17:09:53 UTC (rev 95594)
+++ zope.app.testing/trunk/CHANGES.txt 2009-01-30 17:26:51 UTC (rev 95595)
@@ -5,11 +5,14 @@
3.6.0 (Unreleased)
------------------
-- Fix AttributeError in zope.app.testing.setup.setUpTestAsModule (when
- called without name argument.
-- Use zope.container instead of zope.app.container.
-- Make tests work with location of Folder in zope.site.
+- Fix AttributeError in ``zope.app.testing.setup.setUpTestAsModule``
+ (when called without name argument.
+- Use ``zope.container`` instead of ``zope.app.container``.
+
+- Use ``zope.site`` instead of ``zope.app.folder`` and
+ ``zope.app.component`` for some parts.
+
3.5.6 (2008-10-13)
------------------
Modified: zope.app.testing/trunk/setup.py
===================================================================
--- zope.app.testing/trunk/setup.py 2009-01-30 17:09:53 UTC (rev 95594)
+++ zope.app.testing/trunk/setup.py 2009-01-30 17:26:51 UTC (rev 95595)
@@ -67,7 +67,6 @@
'zope.app.component',
'zope.app.debug',
'zope.app.dependable',
- 'zope.app.folder',
'zope.app.publication',
'zope.app.security',
'zope.component',
@@ -75,9 +74,11 @@
'zope.deferredimport',
'zope.i18n',
'zope.interface',
+ 'zope.location',
'zope.publisher',
'zope.schema',
'zope.security',
+ 'zope.site',
'zope.testing',
'zope.traversing',
],
Modified: zope.app.testing/trunk/src/zope/app/testing/functional.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/functional.py 2009-01-30 17:09:53 UTC (rev 95594)
+++ zope.app.testing/trunk/src/zope/app/testing/functional.py 2009-01-30 17:26:51 UTC (rev 95595)
@@ -48,9 +48,8 @@
from zope.app.publication.http import HTTPPublication
from zope.app.publication.httpfactory import chooseClasses
from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.app.component.hooks import setSite, getSite
+from zope.site.hooks import setSite, getSite
-
class ResponseWrapper(object):
"""A wrapper that adds several introspective methods to a response."""
Modified: zope.app.testing/trunk/src/zope/app/testing/setup.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/setup.py 2009-01-30 17:09:53 UTC (rev 95594)
+++ zope.app.testing/trunk/src/zope/app/testing/setup.py 2009-01-30 17:26:51 UTC (rev 95595)
@@ -53,7 +53,7 @@
#------------------------------------------------------------------------
# ISiteManager lookup
-from zope.app.component.site import SiteManagerAdapter
+from zope.site.site import SiteManagerAdapter
from zope.component.interfaces import IComponentLookup
from zope.interface import Interface
def setUpSiteManagerLookup():
@@ -62,12 +62,12 @@
#------------------------------------------------------------------------
# Placeful setup
-import zope.app.component.hooks
+import zope.site.hooks
from zope.app.testing.placelesssetup import setUp as placelessSetUp
from zope.app.testing.placelesssetup import tearDown as placelessTearDown
def placefulSetUp(site=False):
placelessSetUp()
- zope.app.component.hooks.setHooks()
+ zope.site.hooks.setHooks()
setUpAnnotations()
setUpDependable()
setUpTraversal()
@@ -78,15 +78,15 @@
createSiteManager(site, setsite=True)
return site
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
def placefulTearDown():
placelessTearDown()
- zope.app.component.hooks.resetHooks()
+ zope.site.hooks.resetHooks()
setSite()
#------------------------------------------------------------------------
# Sample Folder Creation
-from zope.app.folder import Folder, rootFolder
+from zope.site.folder import Folder, rootFolder
def buildSampleFolderTree():
# set up a reasonably complex folder structure
#
@@ -129,8 +129,8 @@
#------------------------------------------------------------------------
# Sample Folder Creation
-from zope.app.component.site import LocalSiteManager
-from zope.app.component.interfaces import ISite
+from zope.site.site import LocalSiteManager
+from zope.location.interfaces import ISite
def createSiteManager(folder, setsite=False):
if not ISite.providedBy(folder):
folder.setSiteManager(LocalSiteManager(folder))
More information about the Checkins
mailing list