[Checkins] SVN: zope.app.appsetup/trunk/ Use zope.site instead of zope.app.folder and zope.app.component.
Sylvain Viollon
sylvain at infrae.com
Fri Jan 30 10:26:01 EST 2009
Log message for revision 95575:
Use zope.site instead of zope.app.folder and zope.app.component.
Changed:
U zope.app.appsetup/trunk/CHANGES.txt
U zope.app.appsetup/trunk/setup.py
U zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py
U zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py
U zope.app.appsetup/trunk/src/zope/app/appsetup/debug.txt
U zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py
-=-
Modified: zope.app.appsetup/trunk/CHANGES.txt
===================================================================
--- zope.app.appsetup/trunk/CHANGES.txt 2009-01-30 15:25:07 UTC (rev 95574)
+++ zope.app.appsetup/trunk/CHANGES.txt 2009-01-30 15:26:00 UTC (rev 95575)
@@ -5,13 +5,17 @@
Version 3.9.0 (unreleased)
--------------------------
-- Use zope.container instead of zope.app.container
+- Use ``zope.site`` instead of ``zope.app.folder`` and
+ ``zope.app.component``.
+- Use ``zope.container`` instead of ``zope.app.container``.
+
- Move error log bootstrapping logic from ``zope.error`` into this
package. This removes a dependency from zope.error to this
package. Also added a test for bootstrapping the error log here,
which was missing in ``zope.error``.
+
Version 3.8.0 (2008-08-25)
--------------------------
Modified: zope.app.appsetup/trunk/setup.py
===================================================================
--- zope.app.appsetup/trunk/setup.py 2009-01-30 15:25:07 UTC (rev 95574)
+++ zope.app.appsetup/trunk/setup.py 2009-01-30 15:26:00 UTC (rev 95575)
@@ -53,7 +53,6 @@
namespace_packages=['zope', 'zope.app'],
install_requires=['setuptools',
'zope.app.component',
- 'zope.app.folder',
'zope.app.publication',
'zope.component',
'zope.configuration',
@@ -61,6 +60,8 @@
'zope.error',
'zope.event',
'zope.interface',
+ 'zope.location',
+ 'zope.site',
'zope.security',
'zope.traversing',
'ZODB3',
Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py 2009-01-30 15:25:07 UTC (rev 95574)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py 2009-01-30 15:26:00 UTC (rev 95575)
@@ -21,7 +21,7 @@
import ZODB.interfaces
import zope.interface
import zope.component
-import zope.app.component.hooks
+import zope.site.hooks
from zope.security.interfaces import IParticipation
from zope.security.management import system_user
from zope.app.appsetup import interfaces
@@ -101,7 +101,7 @@
newInteraction(SystemConfigurationParticipation())
# Hook up custom component architecture calls
- zope.app.component.hooks.setHooks()
+ zope.site.hooks.setHooks()
# Load server-independent site config
context = config.ConfigurationMachine()
Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py 2009-01-30 15:25:07 UTC (rev 95574)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py 2009-01-30 15:26:00 UTC (rev 95575)
@@ -28,18 +28,18 @@
import zope.deprecation
import zope.event
import zope.lifecycleevent
+
+from zope.app.publication.zopepublication import ZopePublication
+from zope.app.appsetup import interfaces
+from zope.container.interfaces import INameChooser
+from zope.location.interfaces import ISite
from zope.security.management import getSecurityPolicy
from zope.security.simplepolicies import ParanoidSecurityPolicy
+from zope.site import site
+from zope.site.folder import rootFolder
from zope.traversing.api import traverse
-from zope.app.component.interfaces import ISite
-from zope.app.component import site
-from zope.container.interfaces import INameChooser
-from zope.app.folder import rootFolder
-from zope.app.publication.zopepublication import ZopePublication
-from zope.app.appsetup import interfaces
-
def ensureObject(root_folder, object_name, object_type, object_factory,
asObject=False):
"""Check that there's a basic object in the site
Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/debug.txt
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/debug.txt 2009-01-30 15:25:07 UTC (rev 95574)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/debug.txt 2009-01-30 15:26:00 UTC (rev 95575)
@@ -36,7 +36,7 @@
>>> main_module = sys.modules['__main__']
>>> main_module.root # doctest: +ELLIPSIS
- <zope.app.folder.folder.Folder object at ...>
+ <zope.site.folder.Folder object at ...>
and we have asked Python to enter interactive mode by setting the
PYTHONINSPECT environment variable
Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py 2009-01-30 15:25:07 UTC (rev 95574)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/tests.py 2009-01-30 15:26:00 UTC (rev 95575)
@@ -30,10 +30,10 @@
from zope.error.interfaces import IErrorReportingUtility
from zope.error.error import ErrorReportingUtility
-from zope.app.component import hooks
from zope.app.component.testing import PlacefulSetup
-from zope.app.folder import rootFolder, Folder
-from zope.app.folder.interfaces import IRootFolder
+from zope.site import hooks
+from zope.site.folder import rootFolder, Folder
+from zope.site.interfaces import IRootFolder
from zope.app.publication.zopepublication import ZopePublication
from zope.app.component.site import LocalSiteManager
More information about the Checkins
mailing list