[Zope-Checkins]
SVN: Products.Five/branches/philikon-local-components/
lots and lots of new import paths
Philipp von Weitershausen
philikon at philikon.de
Wed Apr 19 13:23:30 EDT 2006
Log message for revision 67150:
lots and lots of new import paths
Changed:
U Products.Five/branches/philikon-local-components/browser/absoluteurl.py
U Products.Five/branches/philikon-local-components/browser/adding.py
U Products.Five/branches/philikon-local-components/browser/configure.zcml
U Products.Five/branches/philikon-local-components/browser/metaconfigure.py
U Products.Five/branches/philikon-local-components/browser/resource.py
U Products.Five/branches/philikon-local-components/browser/tests/test_absoluteurl.py
U Products.Five/branches/philikon-local-components/component/browser.py
U Products.Five/branches/philikon-local-components/fiveconfigure.py
U Products.Five/branches/philikon-local-components/fivedirectives.py
U Products.Five/branches/philikon-local-components/site/tests/test_localsite.py
U Products.Five/branches/philikon-local-components/sizeconfigure.py
U Products.Five/branches/philikon-local-components/tests/test_size.py
U Products.Five/branches/philikon-local-components/traversable.py
U Products.Five/branches/philikon-local-components/traversing.zcml
-=-
Modified: Products.Five/branches/philikon-local-components/browser/absoluteurl.py
===================================================================
--- Products.Five/branches/philikon-local-components/browser/absoluteurl.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/browser/absoluteurl.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -20,14 +20,14 @@
from zope.interface import implements
from zope.component import getMultiAdapter
-from zope.app.traversing.browser.interfaces import IAbsoluteURL
+from zope.traversing.browser.interfaces import IAbsoluteURL
from Products.Five.browser import BrowserView
class AbsoluteURL(BrowserView):
"""An adapter for Zope3-style absolute_url using Zope2 methods
- (original: zope.app.traversing.browser.absoluteurl)
+ (original: zope.traversing.browser.absoluteurl)
"""
implements(IAbsoluteURL)
@@ -72,7 +72,7 @@
This one is just used to stop breadcrumbs from crumbing up
to the Zope root.
- (original: zope.app.traversing.browser.absoluteurl)
+ (original: zope.traversing.browser.absoluteurl)
"""
def breadcrumbs(self):
Modified: Products.Five/branches/philikon-local-components/browser/adding.py
===================================================================
--- Products.Five/branches/philikon-local-components/browser/adding.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/browser/adding.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -25,13 +25,13 @@
from zope.publisher.interfaces import IPublishTraverse
from zope.component.interfaces import IFactory
from zope.event import notify
+from zope.exceptions import UserError
+from zope.lifecycleevent import ObjectCreatedEvent
-from zope.app.exception.interfaces import UserError
from zope.app.container.interfaces import IAdding, INameChooser
from zope.app.container.interfaces import IContainerNamesContainer
from zope.app.container.constraints import checkFactory, checkObject
from zope.app.publisher.browser.menu import getMenu
-from zope.app.event.objectevent import ObjectCreatedEvent
from Acquisition import Implicit
from zExceptions import BadRequest
Modified: Products.Five/branches/philikon-local-components/browser/configure.zcml
===================================================================
--- Products.Five/branches/philikon-local-components/browser/configure.zcml 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/browser/configure.zcml 2006-04-19 17:23:29 UTC (rev 67150)
@@ -25,7 +25,7 @@
name="absolute_url"
class=".absoluteurl.AbsoluteURL"
permission="zope.Public"
- allowed_interface="zope.app.traversing.browser.interfaces.IAbsoluteURL"
+ allowed_interface="zope.traversing.browser.interfaces.IAbsoluteURL"
/>
<view
@@ -33,7 +33,7 @@
factory=".absoluteurl.AbsoluteURL"
type="zope.publisher.interfaces.http.IHTTPRequest"
permission="zope.Public"
- provides="zope.app.traversing.browser.interfaces.IAbsoluteURL"
+ provides="zope.traversing.browser.interfaces.IAbsoluteURL"
/>
<browser:page
@@ -41,15 +41,15 @@
name="absolute_url"
class=".absoluteurl.SiteAbsoluteURL"
permission="zope.Public"
- allowed_interface="zope.app.traversing.browser.interfaces.IAbsoluteURL"
+ allowed_interface="zope.traversing.browser.interfaces.IAbsoluteURL"
/>
<view
- for="zope.app.traversing.interfaces.IContainmentRoot"
+ for="zope.traversing.interfaces.IContainmentRoot"
factory=".absoluteurl.SiteAbsoluteURL"
type="zope.publisher.interfaces.http.IHTTPRequest"
permission="zope.Public"
- provides="zope.app.traversing.browser.interfaces.IAbsoluteURL"
+ provides="zope.traversing.browser.interfaces.IAbsoluteURL"
/>
<browser:view
Modified: Products.Five/branches/philikon-local-components/browser/metaconfigure.py
===================================================================
--- Products.Five/branches/philikon-local-components/browser/metaconfigure.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/browser/metaconfigure.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -22,6 +22,8 @@
import zope.component
from zope.interface import Interface
+from zope.component.zcml import handler
+from zope.component.interface import provideInterface
from zope.configuration.exceptions import ConfigurationError
from zope.publisher.interfaces.browser import IBrowserRequest, \
IDefaultBrowserLayer
@@ -30,8 +32,6 @@
from zope.app.publisher.browser.viewmeta import view as zope_app_view
from zope.app.publisher.browser.viewmeta import providesCallable, \
_handle_menu, _handle_for
-from zope.app.component.metaconfigure import handler
-from zope.app.component.interface import provideInterface
from Products.Five.browser import BrowserView
from Products.Five.browser.resource import FileResourceFactory, ImageResourceFactory
Modified: Products.Five/branches/philikon-local-components/browser/resource.py
===================================================================
--- Products.Five/branches/philikon-local-components/browser/resource.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/browser/resource.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -26,9 +26,9 @@
from zope.component import getMultiAdapter
from zope.component.interfaces import IResource
from zope.publisher.interfaces.browser import IBrowserPublisher
+from zope.traversing.browser.interfaces import IAbsoluteURL
+from zope.datetime import time as timeFromDateTimeString
-from zope.app.traversing.browser.interfaces import IAbsoluteURL
-from zope.app.datetimeutils import time as timeFromDateTimeString
from zope.app.publisher.fileresource import File, Image
from zope.app.publisher.pagetemplateresource import PageTemplate
from zope.app.publisher.browser.resources import empty
Modified: Products.Five/branches/philikon-local-components/browser/tests/test_absoluteurl.py
===================================================================
--- Products.Five/branches/philikon-local-components/browser/tests/test_absoluteurl.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/browser/tests/test_absoluteurl.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -55,7 +55,7 @@
interface:
>>> from zope.interface import directlyProvides, providedBy
- >>> from zope.app.traversing.interfaces import IContainmentRoot
+ >>> from zope.traversing.interfaces import IContainmentRoot
>>> directlyProvides(self.folder, IContainmentRoot)
>>> for crumb in view.breadcrumbs():
Modified: Products.Five/branches/philikon-local-components/component/browser.py
===================================================================
--- Products.Five/branches/philikon-local-components/component/browser.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/component/browser.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -30,9 +30,9 @@
from zope.component.globalregistry import base
from zope.component.persistentregistry import PersistentComponents
from zope.publisher.interfaces.browser import IBrowserRequest
+from zope.traversing.browser import absoluteURL
from zope.app.component.hooks import clearSite
from zope.app.apidoc.presentation import getViews
-from zope.app.traversing.browser.absoluteurl import absoluteURL
class ComponentsView(BrowserView):
Modified: Products.Five/branches/philikon-local-components/fiveconfigure.py
===================================================================
--- Products.Five/branches/philikon-local-components/fiveconfigure.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/fiveconfigure.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -29,14 +29,13 @@
from zope.interface import classImplements, classImplementsOnly, implementedBy
from zope.interface.interface import InterfaceClass
from zope.component import getUtility
+from zope.component.interface import provideInterface
+from zope.component.zcml import adapter
from zope.configuration import xmlconfig
from zope.configuration.exceptions import ConfigurationError
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from zope.security.interfaces import IPermission
-from zope.app.component.interface import provideInterface
-from zope.component.zcml import adapter
-
from Products.Five import isFiveMethod
from Products.Five.viewable import Viewable
from Products.Five.traversable import Traversable
Modified: Products.Five/branches/philikon-local-components/fivedirectives.py
===================================================================
--- Products.Five/branches/philikon-local-components/fivedirectives.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/fivedirectives.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -17,12 +17,10 @@
"""
from zope.interface import Interface
from zope.app.publisher.browser.metadirectives import IBasicResourceInformation
-from zope.app.security.fields import Permission
+from zope.security.zcml import Permission
from zope.configuration.fields import GlobalObject, Tokens, PythonIdentifier
from zope.configuration.fields import Bool
-from zope.schema import ASCII
-from zope.schema import TextLine
-from zope.schema import BytesLine
+from zope.schema import ASCII, TextLine, BytesLine
class IImplementsDirective(Interface):
"""State that a class implements something.
Modified: Products.Five/branches/philikon-local-components/site/tests/test_localsite.py
===================================================================
--- Products.Five/branches/philikon-local-components/site/tests/test_localsite.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/site/tests/test_localsite.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -27,9 +27,9 @@
from zope.component import getGlobalSiteManager, getSiteManager
from zope.component.interfaces import ComponentLookupError
from zope.component.interfaces import IComponentLookup
+from zope.traversing.interfaces import IContainmentRoot
from zope.app.component.hooks import setSite, getSite, setHooks
from zope.app.component.interfaces import IPossibleSite, ISite
-from zope.app.traversing.interfaces import IContainmentRoot
from zope.app.testing.placelesssetup import PlacelessSetup
from Acquisition import Implicit
Modified: Products.Five/branches/philikon-local-components/sizeconfigure.py
===================================================================
--- Products.Five/branches/philikon-local-components/sizeconfigure.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/sizeconfigure.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -16,7 +16,7 @@
$Id$
"""
-from zope.app.size.interfaces import ISized
+from zope.size.interfaces import ISized
from Products.Five import fivemethod, isFiveMethod
# holds classes that were monkeyed with; for clean up
Modified: Products.Five/branches/philikon-local-components/tests/test_size.py
===================================================================
--- Products.Five/branches/philikon-local-components/tests/test_size.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/tests/test_size.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -20,7 +20,7 @@
execfile(os.path.join(sys.path[0], 'framework.py'))
from zope.interface import implements
-from zope.app.size.interfaces import ISized
+from zope.size.interfaces import ISized
class SimpleContentSize(object):
"""Size for ``SimpleContent`` objects."""
@@ -64,12 +64,12 @@
... <five:sizable class="Products.Five.tests.testing.fancycontent.FancyContent" />
... <adapter
... for="Products.Five.tests.testing.simplecontent.ISimpleContent"
- ... provides="zope.app.size.interfaces.ISized"
+ ... provides="zope.size.interfaces.ISized"
... factory="Products.Five.tests.test_size.SimpleContentSize"
... />
... <adapter
... for="Products.Five.tests.testing.fancycontent.IFancyContent"
- ... provides="zope.app.size.interfaces.ISized"
+ ... provides="zope.size.interfaces.ISized"
... factory="Products.Five.tests.test_size.FancyContentSize"
... />
... </configure>'''
Modified: Products.Five/branches/philikon-local-components/traversable.py
===================================================================
--- Products.Five/branches/philikon-local-components/traversable.py 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/traversable.py 2006-04-19 17:23:29 UTC (rev 67150)
@@ -21,10 +21,10 @@
from zope.interface import implements, Interface
from zope.publisher.interfaces import ILayer
from zope.publisher.interfaces.browser import IBrowserRequest
+from zope.traversing.interfaces import ITraverser, ITraversable
+from zope.traversing.adapters import DefaultTraversable
+from zope.traversing.adapters import traversePathElement
-from zope.app.traversing.interfaces import ITraverser, ITraversable
-from zope.app.traversing.adapters import DefaultTraversable
-from zope.app.traversing.adapters import traversePathElement
from zope.app.publication.browser import setDefaultSkin
from zope.app.interface import queryType
Modified: Products.Five/branches/philikon-local-components/traversing.zcml
===================================================================
--- Products.Five/branches/philikon-local-components/traversing.zcml 2006-04-19 17:13:06 UTC (rev 67149)
+++ Products.Five/branches/philikon-local-components/traversing.zcml 2006-04-19 17:23:29 UTC (rev 67150)
@@ -2,7 +2,7 @@
xmlns:five="http://namespaces.zope.org/five">
<!-- define default namespace adapters, etc. -->
- <include package="zope.app.traversing" />
+ <include package="zope.traversing" />
<!-- use ITraverser/ITraversable duo for both publishing traversal
and object graph traversal; this should change in the future,
@@ -11,13 +11,13 @@
<adapter
for="*"
factory=".traversable.FiveTraversable"
- provides="zope.app.traversing.interfaces.ITraversable"
+ provides="zope.traversing.interfaces.ITraversable"
/>
<adapter
for="*"
- factory="zope.app.traversing.adapters.Traverser"
- provides="zope.app.traversing.interfaces.ITraverser"
+ factory="zope.traversing.adapters.Traverser"
+ provides="zope.traversing.interfaces.ITraverser"
/>
<adapter
More information about the Zope-Checkins
mailing list