Commit a60cb075 authored by Hanno Schlichting's avatar Hanno Schlichting

Another one bites the dust - Removed the dependency on zope.app.publication in...

Another one bites the dust - Removed the dependency on zope.app.publication in favor of new versions of zope.publisher and zope.traversing.
parent ac30d65f
...@@ -24,7 +24,7 @@ Zope2 depends on the following zope.app packages directly: ...@@ -24,7 +24,7 @@ Zope2 depends on the following zope.app packages directly:
* Products.Five.browser.pagetemplatefile * Products.Five.browser.pagetemplatefile
* Products.Five.browser.metaconfigure * Products.Five.browser.metaconfigure
- [_] zope.app.publication - [x] zope.app.publication
o ZPublisher.BaseRequest (imports ``EndRequestEvent``) o ZPublisher.BaseRequest (imports ``EndRequestEvent``)
o Products.Five.component (imports ``BeforeTraverseEvent``; o Products.Five.component (imports ``BeforeTraverseEvent``;
ZCML registers subscribers for ``IBeforeTraverseEvent`` ZCML registers subscribers for ``IBeforeTraverseEvent``
......
...@@ -98,7 +98,6 @@ eggs = ...@@ -98,7 +98,6 @@ eggs =
zope.viewlet zope.viewlet
zope.app.form zope.app.form
zope.app.pagetemplate zope.app.pagetemplate
zope.app.publication
zope.app.publisher zope.app.publisher
zope.app.schema zope.app.schema
# Fetch undeclared ftests dependencies # Fetch undeclared ftests dependencies
......
...@@ -11,6 +11,9 @@ Trunk (unreleased) ...@@ -11,6 +11,9 @@ Trunk (unreleased)
Restructuring Restructuring
+++++++++++++ +++++++++++++
- Removed the dependency on zope.app.publication in favor of new versions of
zope.publisher and zope.traversing.
- Requiring Python 2.6 officially - Requiring Python 2.6 officially
- Changed startup server tests in Zope2 to use a randomized port number, to - Changed startup server tests in Zope2 to use a randomized port number, to
......
...@@ -135,7 +135,6 @@ params = dict(name='Zope2', ...@@ -135,7 +135,6 @@ params = dict(name='Zope2',
'zope.traversing', 'zope.traversing',
'zope.viewlet', 'zope.viewlet',
'zope.app.form', 'zope.app.form',
'zope.app.publication',
'zope.app.schema', 'zope.app.schema',
], ],
......
...@@ -20,7 +20,7 @@ import zope.component ...@@ -20,7 +20,7 @@ import zope.component
import zope.event import zope.event
from zope.component.interfaces import IComponentLookup from zope.component.interfaces import IComponentLookup
from zope.location.interfaces import ISite, IPossibleSite from zope.location.interfaces import ISite, IPossibleSite
from zope.app.publication.zopepublication import BeforeTraverseEvent from zope.traversing.interfaces import BeforeTraverseEvent
import ExtensionClass import ExtensionClass
from Acquisition import aq_base, aq_inner, aq_parent from Acquisition import aq_base, aq_inner, aq_parent
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<subscriber <subscriber
for="zope.location.interfaces.ISite for="zope.location.interfaces.ISite
zope.app.publication.interfaces.IBeforeTraverseEvent" zope.traversing.interfaces.IBeforeTraverseEvent"
handler="zope.site.site.threadSiteSubscriber" handler="zope.site.site.threadSiteSubscriber"
/> />
<subscriber <subscriber
for="zope.app.publication.interfaces.IEndRequestEvent" for="zope.publisher.interfaces.IEndRequestEvent"
handler="zope.site.site.clearThreadSiteSubscriber" handler="zope.site.site.clearThreadSiteSubscriber"
/> />
......
...@@ -23,8 +23,8 @@ from Acquisition.interfaces import IAcquirer ...@@ -23,8 +23,8 @@ from Acquisition.interfaces import IAcquirer
from zope.interface import implements, Interface from zope.interface import implements, Interface
from zope.component import queryMultiAdapter from zope.component import queryMultiAdapter
from zope.event import notify from zope.event import notify
from zope.app.publication.interfaces import EndRequestEvent
from zope.publisher.defaultview import queryDefaultViewName from zope.publisher.defaultview import queryDefaultViewName
from zope.publisher.interfaces import EndRequestEvent
from zope.publisher.interfaces import IPublishTraverse from zope.publisher.interfaces import IPublishTraverse
from zope.publisher.interfaces.browser import IBrowserPublisher from zope.publisher.interfaces.browser import IBrowserPublisher
from zope.traversing.interfaces import TraversalError from zope.traversing.interfaces import TraversalError
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment