[Zope-Checkins] SVN: Zope/trunk/ Catch up with the rest of the Zope Toolkit of the day and loose dependencies on zope.app.appsetup, zope.app.component and zope.app.container.
Hanno Schlichting
hannosch at hannosch.eu
Sun May 24 14:34:56 EDT 2009
Log message for revision 100340:
Catch up with the rest of the Zope Toolkit of the day and loose dependencies on zope.app.appsetup, zope.app.component and zope.app.container.
Changed:
U Zope/trunk/alltests.cfg
U Zope/trunk/doc/CHANGES.rst
U Zope/trunk/setup.py
U Zope/trunk/src/Products/Five/doc/formlib.txt
U Zope/trunk/src/Products/Five/formlib/formbase.py
U Zope/trunk/src/Products/Five/meta.zcml
U Zope/trunk/src/ZPublisher/BaseRequest.py
U Zope/trunk/src/Zope2/App/startup.py
U Zope/trunk/src/Zope2/Startup/__init__.py
U Zope/trunk/src/Zope2/Startup/handlers.py
U Zope/trunk/versions.cfg
-=-
Modified: Zope/trunk/alltests.cfg
===================================================================
--- Zope/trunk/alltests.cfg 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/alltests.cfg 2009-05-24 18:34:56 UTC (rev 100340)
@@ -17,14 +17,17 @@
tempstorage
zLOG
zope.annotation
+ zope.authentication
zope.broken
zope.browser
zope.cachedescriptors
zope.component
+ zope.componentvocabulary
zope.configuration
zope.container
zope.contentprovider
zope.contenttype
+ zope.copy
zope.datetime
zope.deferredimport
zope.deprecation
@@ -33,6 +36,7 @@
zope.error
zope.event
zope.exceptions
+ zope.filerepresentation
zope.formlib
zope.hookable
zope.i18n
@@ -44,6 +48,8 @@
zope.minmax
zope.modulealias
zope.pagetemplate
+ zope.password
+ zope.processlifetime
zope.proxy
zope.publisher
zope.schema
@@ -60,14 +66,19 @@
zope.thread
zope.traversing
zope.viewlet
+ zope.app.form
+ zope.app.pagetemplate
+ zope.app.publication
+ zope.app.publisher
+ zope.app.schema
# Fetch undeclared ftests dependencies
- zope.app.broken
+ zope.app.applicationcontrol
+ zope.app.exception
+ zope.app.http
zope.app.principalannotation
- zope.app.schema
zope.app.securitypolicy
- zope.app.testing
+ zope.app.zptpage
zope.app.zcmlfiles
- zope.app.zptpage
- python-gettext
+
defaults = ['--module', '!^(zope[.]app)[.]']
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/doc/CHANGES.rst 2009-05-24 18:34:56 UTC (rev 100340)
@@ -20,10 +20,31 @@
- Testing.ZopeTestCase: Include a copy of ZODB.tests.warnhook to silence
a DeprecationWarning under Python 2.6.
-- Updated packages: pytz 2009g, zope.browser 1.2, zope.container 3.8.2,
- zope.lifecycleevent 3.5.2, zope.location 3.5.4, zope.publisher 3.7.0,
- zope.testing 3.7.4.
+- Updated packages:
+ * pytz 2009g
+ * zope.app.applicationcontrol = 3.5.0
+ * zope.app.appsetup 3.11
+ * zope.app.component 3.8.2
+ * zope.app.container 3.8.0
+ * zope.app.http 3.6.0
+ * zope.app.interface 3.5.0
+ * zope.app.pagetemplate 3.6.0
+ * zope.app.publication 3.7.0
+ * zope.app.publisher 3.8.0
+ * zope.browser 1.2
+ * zope.component 3.7.0
+ * zope.componentvocabulary 1.0
+ * zope.container 3.8.2
+ * zope.formlib 3.6.0
+ * zope.lifecycleevent 3.5.2
+ * zope.location 3.5.4
+ * zope.processlifetime 1.0
+ * zope.publisher 3.8.0
+ * zope.security 3.7.0
+ * zope.testing 3.7.4
+ * zope.traversing 3.7.0
+
Bugs Fixed
++++++++++
Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/setup.py 2009-05-24 18:34:56 UTC (rev 100340)
@@ -102,17 +102,18 @@
install_requires=[
'Acquisition',
'DateTime',
- 'docutils',
'ExtensionClass',
'Persistence',
- 'pytz',
'RestrictedPython',
- 'tempstorage',
'ZConfig',
- 'zLOG',
- 'zdaemon',
'ZODB3',
- 'zodbcode',
+ 'docutils',
+ 'pytz',
+ 'setuptools',
+ 'tempstorage',
+ 'transaction',
+ 'zdaemon',
+ 'zLOG',
'zope.component',
'zope.configuration',
'zope.container',
@@ -128,6 +129,7 @@
'zope.lifecycleevent',
'zope.location',
'zope.pagetemplate',
+ 'zope.processlifetime',
'zope.proxy',
'zope.publisher',
'zope.schema',
@@ -143,9 +145,6 @@
'zope.testing',
'zope.traversing',
'zope.viewlet',
- 'zope.app.appsetup',
- 'zope.app.component',
- 'zope.app.container',
'zope.app.form',
'zope.app.pagetemplate',
'zope.app.publication',
Modified: Zope/trunk/src/Products/Five/doc/formlib.txt
===================================================================
--- Zope/trunk/src/Products/Five/doc/formlib.txt 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/src/Products/Five/doc/formlib.txt 2009-05-24 18:34:56 UTC (rev 100340)
@@ -16,9 +16,3 @@
actions to your form.
See Products.Five.formlib.tests for a minimal example.
-
-Note:
------
-
-Currently zope.formlib.page and zope.formlib.namedtemplate are not
-supported in Five.
Modified: Zope/trunk/src/Products/Five/formlib/formbase.py
===================================================================
--- Zope/trunk/src/Products/Five/formlib/formbase.py 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/src/Products/Five/formlib/formbase.py 2009-05-24 18:34:56 UTC (rev 100340)
@@ -17,13 +17,11 @@
"""
import os.path
-from datetime import datetime
-
import zope.event
import zope.formlib
import zope.lifecycleevent
from zope import interface
-from zope.formlib import interfaces, form, namedtemplate
+from zope.formlib import interfaces, form
from zope.i18nmessageid import MessageFactory
_ = MessageFactory("zope")
Modified: Zope/trunk/src/Products/Five/meta.zcml
===================================================================
--- Zope/trunk/src/Products/Five/meta.zcml 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/src/Products/Five/meta.zcml 2009-05-24 18:34:56 UTC (rev 100340)
@@ -13,8 +13,8 @@
<meta:directive
name="view"
- schema="zope.app.component.metadirectives.IViewDirective"
- handler="zope.app.component.metaconfigure.view"
+ schema="zope.component.zcml.IViewDirective"
+ handler="zope.component.zcml.view"
/>
<meta:complexDirective
Modified: Zope/trunk/src/ZPublisher/BaseRequest.py
===================================================================
--- Zope/trunk/src/ZPublisher/BaseRequest.py 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/src/ZPublisher/BaseRequest.py 2009-05-24 18:34:56 UTC (rev 100340)
@@ -24,7 +24,7 @@
from zope.component import queryMultiAdapter
from zope.event import notify
from zope.app.publication.interfaces import EndRequestEvent
-from zope.app.publisher.browser import queryDefaultViewName
+from zope.publisher.defaultview import queryDefaultViewName
from zope.publisher.interfaces import IPublishTraverse
from zope.publisher.interfaces.browser import IBrowserPublisher
from zope.traversing.interfaces import TraversalError
Modified: Zope/trunk/src/Zope2/App/startup.py
===================================================================
--- Zope/trunk/src/Zope2/App/startup.py 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/src/Zope2/App/startup.py 2009-05-24 18:34:56 UTC (rev 100340)
@@ -39,7 +39,7 @@
import ZPublisher
from zope.event import notify
-from zope.app import appsetup
+from zope.processlifetime import DatabaseOpened
app = None
startup_time = asctime()
@@ -82,7 +82,7 @@
else:
DB = ZODB.DB(m.Storage, databases=databases)
- notify(appsetup.interfaces.DatabaseOpened(DB))
+ notify(DatabaseOpened(DB))
Globals.BobobaseName = DB.getName()
Modified: Zope/trunk/src/Zope2/Startup/__init__.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/__init__.py 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/src/Zope2/Startup/__init__.py 2009-05-24 18:34:56 UTC (rev 100340)
@@ -31,7 +31,7 @@
from ZConfig.components.logger import loghandler
from zope.event import notify
-from zope.app import appsetup
+from zope.processlifetime import ProcessStarting
logger = logging.getLogger("Zope")
started = False
@@ -73,7 +73,7 @@
def sendEvents(self):
- notify(appsetup.interfaces.ProcessStarting())
+ notify(ProcessStarting())
def prepare(self):
self.setupInitialLogging()
Modified: Zope/trunk/src/Zope2/Startup/handlers.py
===================================================================
--- Zope/trunk/src/Zope2/Startup/handlers.py 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/src/Zope2/Startup/handlers.py 2009-05-24 18:34:56 UTC (rev 100340)
@@ -8,7 +8,6 @@
try:
import twisted.internet
from twisted.application.service import MultiService
- import zope.app.appsetup.interfaces
import zope.app.twisted.main
import twisted.web2.wsgi
Modified: Zope/trunk/versions.cfg
===================================================================
--- Zope/trunk/versions.cfg 2009-05-24 17:24:00 UTC (rev 100339)
+++ Zope/trunk/versions.cfg 2009-05-24 18:34:56 UTC (rev 100340)
@@ -29,14 +29,14 @@
zodbcode = 3.4.0
zope.annotation = 3.4.2
zope.app.apidoc = 3.6.2
-zope.app.applicationcontrol = 3.4.3
-zope.app.appsetup = 3.10.1
+zope.app.applicationcontrol = 3.5.0
+zope.app.appsetup = 3.11
zope.app.basicskin = 3.4.0
zope.app.broken = 3.5.0
zope.app.cache = 3.5.0
zope.app.catalog = 3.8.0
-zope.app.component = 3.7.0
-zope.app.container = 3.7.2
+zope.app.component = 3.8.2
+zope.app.container = 3.8.0
zope.app.content = 3.4.0
zope.app.dav = 3.5.0
zope.app.debug = 3.4.1
@@ -48,16 +48,16 @@
zope.app.folder = 3.5.1
zope.app.form = 3.7.3
zope.app.generations = 3.5.0
-zope.app.http = 3.5.2
+zope.app.http = 3.6.0
zope.app.i18n = 3.6.0
-zope.app.interface = 3.4.0
+zope.app.interface = 3.5.0
zope.app.intid = 3.7.0
zope.app.locales = 3.5.1
zope.app.localpermission = 3.7.0
-zope.app.pagetemplate = 3.5.0
+zope.app.pagetemplate = 3.6.0
zope.app.principalannotation = 3.6.1
-zope.app.publication = 3.5.3
-zope.app.publisher = 3.6.2
+zope.app.publication = 3.7.0
+zope.app.publisher = 3.8.0
zope.app.renderer = 3.5.0
zope.app.schema = 3.5.0
zope.app.security = 3.7.0
@@ -77,7 +77,8 @@
zope.browser = 1.2
zope.cachedescriptors = 3.5.0
zope.catalog = 3.8.0
-zope.component = 3.6.0
+zope.component = 3.7.0
+zope.componentvocabulary = 1.0
zope.configuration = 3.6.0
zope.container = 3.8.2
zope.contentprovider = 3.5.0
@@ -95,7 +96,7 @@
zope.event = 3.4.1
zope.exceptions = 3.5.2
zope.filerepresentation = 3.5.0
-zope.formlib = 3.5.2
+zope.formlib = 3.6.0
zope.hookable = 3.4.1
zope.i18n = 3.7.0
zope.i18nmessageid = 3.4.3
@@ -110,10 +111,11 @@
zope.pagetemplate = 3.4.2
zope.principalannotation = 3.6.0
zope.principalregistry = 3.7.0
+zope.processlifetime = 1.0
zope.proxy = 3.5.0
-zope.publisher = 3.7.0
+zope.publisher = 3.8.0
zope.schema = 3.5.4
-zope.security = 3.6.3
+zope.security = 3.7.0
zope.securitypolicy = 3.6.0
zope.sendmail = 3.5.1
zope.sequencesort = 3.4.0
@@ -126,5 +128,5 @@
zope.tales = 3.4.0
zope.testbrowser = 3.6.0a2
zope.testing = 3.7.4
-zope.traversing = 3.6.0
+zope.traversing = 3.7.0
zope.viewlet = 3.5.0
More information about the Zope-Checkins
mailing list