[Checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/ Adjust
zope.app to the new import location of zope.app.location.
Philipp von Weitershausen
philikon at philikon.de
Wed Apr 5 10:15:51 EDT 2006
Log message for revision 66539:
Adjust zope.app to the new import location of zope.app.location.
Changed:
U Zope3/branches/jim-adapter/src/zope/app/apidoc/apidoc.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/README.txt
U Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/introspector.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/class_.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/codemodule.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/function.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/module.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/text.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/ifacemodule/browser.txt
U Zope3/branches/jim-adapter/src/zope/app/apidoc/ifacemodule/ifacemodule.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/tests.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/typemodule/type.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/browser.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/tests.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/utilitymodule.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/browser.py
U Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/tests.py
U Zope3/branches/jim-adapter/src/zope/app/applicationcontrol/applicationcontrol.py
U Zope3/branches/jim-adapter/src/zope/app/authentication/authentication.py
U Zope3/branches/jim-adapter/src/zope/app/broken/broken.py
U Zope3/branches/jim-adapter/src/zope/app/component/contentdirective.py
U Zope3/branches/jim-adapter/src/zope/app/component/site.py
U Zope3/branches/jim-adapter/src/zope/app/component/site.txt
U Zope3/branches/jim-adapter/src/zope/app/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/container/browser/adding.py
U Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/container/contained.py
U Zope3/branches/jim-adapter/src/zope/app/container/interfaces.py
U Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/copypastemove/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/dav/opaquenamespaces.py
U Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py
U Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py
U Zope3/branches/jim-adapter/src/zope/app/demo/passwdauth/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py
U Zope3/branches/jim-adapter/src/zope/app/folder/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_editview.py
U Zope3/branches/jim-adapter/src/zope/app/fssync/fspickle.py
U Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_committer.py
U Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_fspickle.py
U Zope3/branches/jim-adapter/src/zope/app/intid/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/intid/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/intid/tests.py
U Zope3/branches/jim-adapter/src/zope/app/onlinehelp/tests/test_helpdirectives.py
U Zope3/branches/jim-adapter/src/zope/app/onlinehelp/tests/test_onlinehelp.py
U Zope3/branches/jim-adapter/src/zope/app/pluggableauth/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/preference/README.txt
U Zope3/branches/jim-adapter/src/zope/app/preference/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/preference/default.py
U Zope3/branches/jim-adapter/src/zope/app/preference/interfaces.py
U Zope3/branches/jim-adapter/src/zope/app/preference/preference.py
U Zope3/branches/jim-adapter/src/zope/app/principalannotation/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_zopepublication.py
U Zope3/branches/jim-adapter/src/zope/app/publication/zopepublication.py
U Zope3/branches/jim-adapter/src/zope/app/publisher/browser/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/publisher/browser/resource.py
U Zope3/branches/jim-adapter/src/zope/app/publisher/browser/resources.py
U Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/README.txt
U Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/pythonpage/tests.py
U Zope3/branches/jim-adapter/src/zope/app/schema/browser/traversal.py
U Zope3/branches/jim-adapter/src/zope/app/security/adapter.py
U Zope3/branches/jim-adapter/src/zope/app/security/permission.py
U Zope3/branches/jim-adapter/src/zope/app/securitypolicy/role.py
U Zope3/branches/jim-adapter/src/zope/app/testing/setup.py
U Zope3/branches/jim-adapter/src/zope/app/tree/adapters.py
U Zope3/branches/jim-adapter/src/zope/app/tree/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/tree/tests/test_adapters.py
U Zope3/branches/jim-adapter/src/zope/app/undo/tests/test_zodbundomanager.py
U Zope3/branches/jim-adapter/src/zope/app/versioncontrol/history.py
U Zope3/branches/jim-adapter/src/zope/app/versioncontrol/tests.py
U Zope3/branches/jim-adapter/src/zope/app/versioncontrol/utility.py
U Zope3/branches/jim-adapter/src/zope/app/versioncontrol/version.py
U Zope3/branches/jim-adapter/src/zope/app/zptpage/tests/test_zptpage.py
-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/apidoc.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/apidoc.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/apidoc.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -17,13 +17,12 @@
"""
__docformat__ = 'restructuredtext'
+import zope.component
from zope.interface import implements
from zope.publisher.browser import applySkin
+from zope.location import locate
+from zope.location.interfaces import ILocation
-from zope.app import zapi
-from zope.app.location import locate
-from zope.app.location.interfaces import ILocation
-
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase
@@ -42,14 +41,14 @@
def get(self, key, default=None):
"""See zope.app.container.interfaces.IReadContainer"""
- utility = zapi.queryUtility(IDocumentationModule, key, default)
+ utility = zope.component.queryUtility(IDocumentationModule, key, default)
if utility != default:
locate(utility, self, key)
return utility
def items(self):
"""See zope.app.container.interfaces.IReadContainer"""
- items = list(zapi.getUtilitiesFor(IDocumentationModule))
+ items = list(zope.component.getUtilitiesFor(IDocumentationModule))
items.sort()
utils = []
for key, value in items:
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/README.txt 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/README.txt 2006-04-05 14:15:32 UTC (rev 66539)
@@ -142,8 +142,8 @@
>>> pprint(details.getInterfaces())
[{'path': 'zope.app.apidoc.interfaces.IDocumentationModule',
'url': 'zope.app.apidoc.interfaces.IDocumentationModule'},
- {'path': 'zope.app.location.interfaces.ILocation',
- 'url': 'zope.app.location.interfaces.ILocation'},
+ {'path': 'zope.location.interfaces.ILocation',
+ 'url': 'zope.location.interfaces.ILocation'},
{'path': 'zope.app.apidoc.codemodule.interfaces.IModuleDocumentation',
'url': 'zope.app.apidoc.codemodule.interfaces.IModuleDocumentation'},
{'path': 'zope.app.container.interfaces.IReadContainer',
@@ -604,4 +604,4 @@
'value_type': 'PersistentList',
'value_type_link': 'persistent/list/PersistentList'}]
-And that's it. Fur some browser-based demonstration see ``introspector.txt``.
\ No newline at end of file
+And that's it. Fur some browser-based demonstration see ``introspector.txt``.
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/introspector.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/introspector.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/browser/introspector.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -24,11 +24,11 @@
import zope.security.proxy
from zope.interface import directlyProvidedBy, directlyProvides
from zope.traversing.interfaces import IPhysicallyLocatable, IContainmentRoot
+from zope.location import location
+
from zope.app import zapi, apidoc, annotation
-from zope.app.location import location
from zope.app.publisher.browser import BrowserView
-
def getTypeLink(type):
if type is types.NoneType:
return None
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/class_.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/class_.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/class_.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -22,7 +22,7 @@
from zope.interface import implements, implementedBy
from zope.security.checker import getCheckerForInstancesOf
-from zope.app.location.interfaces import ILocation
+from zope.location.interfaces import ILocation
from zope.app.apidoc.classregistry import classRegistry
from zope.app.apidoc.utilities import getInterfaceForAttribute
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/codemodule.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/codemodule.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/codemodule.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -19,11 +19,12 @@
$Id: __init__.py 29269 2005-02-23 22:22:48Z srichter $
"""
__docformat__ = 'restructuredtext'
+
+import zope.component
from zope.interface import Interface, implements
-from zope.app import zapi
+from zope.location.interfaces import ILocation
+
from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.location.interfaces import ILocation
-
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.classregistry import safe_import
from zope.app.apidoc.codemodule.interfaces import IAPIDocRootModule
@@ -68,7 +69,7 @@
"""Setup module and class tree."""
if self.__isSetup:
return
- for name, mod in zapi.getUtilitiesFor(IAPIDocRootModule):
+ for name, mod in zope.component.getUtilitiesFor(IAPIDocRootModule):
module = safe_import(mod)
if module is not None:
self._children[name] = Module(self, name, module)
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/function.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/function.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/function.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -16,8 +16,9 @@
$Id: __init__.py 29143 2005-02-14 22:43:16Z srichter $
"""
__docformat__ = 'restructuredtext'
+
from zope.interface import implements
-from zope.app.location.interfaces import ILocation
+from zope.location.interfaces import ILocation
from zope.app.apidoc.utilities import getFunctionSignature
from interfaces import IFunctionDocumentation
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/module.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/module.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/module.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -22,8 +22,8 @@
import zope
from zope.interface import implements
from zope.interface.interface import InterfaceClass
-from zope.app.location.interfaces import ILocation
-from zope.app.location import LocationProxy
+from zope.location.interfaces import ILocation
+from zope.location import LocationProxy
from zope.app.apidoc.classregistry import safe_import
from zope.app.apidoc.utilities import ReadContainerBase
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/text.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/text.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/codemodule/text.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -17,7 +17,7 @@
"""
__docformat__ = 'restructuredtext'
from zope.interface import implements
-from zope.app.location.interfaces import ILocation
+from zope.location.interfaces import ILocation
class TextFile(object):
"""This class represents a function declared in the module."""
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/ifacemodule/browser.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/ifacemodule/browser.txt 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/ifacemodule/browser.txt 2006-04-05 14:15:32 UTC (rev 66539)
@@ -160,7 +160,7 @@
>>> ifacemodule.__parent__ = Root()
>>> ifacemodule.__name__ = 'Interfaces'
- >>> from zope.app.location import LocationProxy
+ >>> from zope.location import LocationProxy
>>> iface = LocationProxy(IFoo, ifacemodule, 'IFoo')
and finally the details view:
@@ -311,8 +311,8 @@
'name': 'Interface'}],
'zcml': None},
{'doc': u'',
- 'factory': 'zope.app.location.traversing.LocationPhysicallyLocatable',
- 'factory_url': 'zope/app/location/traversing/LocationPhysicallyLocatable',
+ 'factory': 'zope.location.traversing.LocationPhysicallyLocatable',
+ 'factory_url': 'zope/location/traversing/LocationPhysicallyLocatable',
'name': '',
'provided': {'module': 'zope.traversing.interfaces',
'name': 'IPhysicallyLocatable'},
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/ifacemodule/ifacemodule.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/ifacemodule/ifacemodule.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/ifacemodule/ifacemodule.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -24,11 +24,12 @@
from zope.app import zapi
from zope.interface import implements
+from zope.location import LocationProxy
+
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase
-from zope.app.location import LocationProxy
-from zope.app.component.interface \
- import queryInterface, searchInterfaceUtilities
+from zope.app.component.interface import queryInterface
+from zope.app.component.interface import searchInterfaceUtilities
from zope.app.i18n import ZopeMessageFactory as _
class IInterfaceModule(IDocumentationModule):
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/tests.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/tests.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -19,15 +19,13 @@
import unittest
import zope.component.testing
-
from zope.component.interfaces import IFactory
from zope.interface import implements
from zope.testing import doctest, doctestunit
from zope.traversing.interfaces import IContainmentRoot
+from zope.location import LocationProxy
-from zope.app.location import LocationProxy
from zope.app.testing import placelesssetup, ztapi, setup
-
from zope.app.renderer.rest import ReStructuredTextSourceFactory
from zope.app.renderer.rest import IReStructuredTextSource
from zope.app.renderer.rest import ReStructuredTextToHTMLRenderer
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/typemodule/type.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/typemodule/type.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/typemodule/type.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -16,17 +16,17 @@
$Id: __init__.py 29143 2005-02-14 22:43:16Z srichter $
"""
__docformat__ = 'restructuredtext'
-from zope.interface import implements
+
+from zope.interface import implements
+from zope.component import queryUtility, getUtilitiesFor
from zope.interface.interfaces import IInterface
+from zope.location import LocationProxy
+from zope.location.interfaces import ILocation
-from zope.app import zapi
from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.location import LocationProxy
-from zope.app.location.interfaces import ILocation
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase
-
class TypeInterface(ReadContainerBase):
"""Representation of the special type interface.
@@ -62,13 +62,13 @@
def get(self, key, default=None):
"""See zope.app.container.interfaces.IReadContainer"""
return LocationProxy(
- zapi.queryUtility(self.interface, key, default=default),
+ queryUtility(self.interface, key, default=default),
self, key)
def items(self):
"""See zope.app.container.interfaces.IReadContainer"""
results = [(name, LocationProxy(iface, self, name))
- for name, iface in zapi.getUtilitiesFor(self.interface)]
+ for name, iface in getUtilitiesFor(self.interface)]
results.sort(lambda x, y: cmp(x[1].getName(), y[1].getName()))
return results
@@ -109,11 +109,11 @@
def get(self, key, default=None):
return TypeInterface(
- zapi.queryUtility(IInterface, key, default=default), self, key)
+ queryUtility(IInterface, key, default=default), self, key)
def items(self):
results = [(name, TypeInterface(iface, self, name))
- for name, iface in zapi.getUtilitiesFor(IInterface)
+ for name, iface in getUtilitiesFor(IInterface)
if iface.extends(IInterface)]
results.sort(lambda x, y: cmp(x[1].interface.getName(),
y[1].interface.getName()))
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/browser.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/browser.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/browser.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -18,9 +18,9 @@
__docformat__ = 'restructuredtext'
from zope.security.proxy import removeSecurityProxy
+from zope.location import LocationProxy
from zope.app import zapi
-from zope.app.location import LocationProxy
from zope.app.apidoc.ifacemodule.browser import InterfaceDetails
from zope.app.apidoc.component import getUtilityInfoDictionary
from zope.app.apidoc.utilities import getPythonPath
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/tests.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/tests.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -18,8 +18,8 @@
import unittest
from zope.testing import doctest, doctestunit
from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.location.traversing import LocationPhysicallyLocatable
-from zope.app.location.traversing import LocationPhysicallyLocatable
from zope.app.testing import placelesssetup, ztapi
from zope.app.tree.interfaces import IUniqueId
from zope.app.tree.adapters import LocationUniqueId
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/utilitymodule.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/utilitymodule.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/utilitymodule/utilitymodule.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -19,13 +19,13 @@
import base64, binascii
+import zope.component
from zope.component.registry import UtilityRegistration
from zope.interface import implements
+from zope.location.interfaces import ILocation
-from zope.app import zapi
from zope.app.i18n import ZopeMessageFactory as _
from zope.app.component import queryNextSiteManager
-from zope.app.location.interfaces import ILocation
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase, getPythonPath
@@ -68,7 +68,7 @@
def get(self, key, default=None):
"""See zope.app.container.interfaces.IReadContainer"""
- sm = zapi.getGlobalSiteManager()
+ sm = zope.component.getGlobalSiteManager()
key = decodeName(key)
if key == NONAME:
key = ''
@@ -79,7 +79,7 @@
def items(self):
"""See zope.app.container.interfaces.IReadContainer"""
- sm = zapi.getGlobalSiteManager()
+ sm = zope.component.getGlobalSiteManager()
items = [(encodeName(reg.name or NONAME), Utility(self, reg))
for reg in sm.registeredUtilities()
if self.interface == reg.provided]
@@ -120,7 +120,7 @@
return UtilityInterface(self, key, getattr(mod, parts[-1], default))
def items(self):
- sm = zapi.getSiteManager()
+ sm = zope.component.getSiteManager()
ifaces = {}
while sm is not None:
for reg in sm.registrations():
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/__init__.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/__init__.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -24,10 +24,10 @@
from zope.configuration import docutils, xmlconfig
from zope.interface import implements
+from zope.location.interfaces import ILocation
import zope.app.appsetup.appsetup
from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.location.interfaces import ILocation
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/browser.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/browser.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/browser.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -21,9 +21,9 @@
from zope.configuration.xmlconfig import ParserInfo
from zope.security.proxy import removeSecurityProxy
+from zope.location import LocationProxy
from zope.app import zapi
-from zope.app.location import LocationProxy
from zope.app.apidoc.zcmlmodule import Directive, Namespace
from zope.app.apidoc.ifacemodule.browser import InterfaceDetails
from zope.app.apidoc.utilities import getPythonPath, isReferencable
Modified: Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/tests.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/apidoc/zcmlmodule/tests.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -20,9 +20,9 @@
from zope.configuration import xmlconfig
from zope.testing import doctest, doctestunit
from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.location.traversing import LocationPhysicallyLocatable
import zope.app.appsetup.appsetup
-from zope.app.location.traversing import LocationPhysicallyLocatable
from zope.app.tree.interfaces import IUniqueId
from zope.app.tree.adapters import LocationUniqueId
from zope.app.testing import placelesssetup, ztapi
Modified: Zope3/branches/jim-adapter/src/zope/app/applicationcontrol/applicationcontrol.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/applicationcontrol/applicationcontrol.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/applicationcontrol/applicationcontrol.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -16,12 +16,12 @@
$Id$"""
__docformat__ = 'restructuredtext'
-from zope.app.applicationcontrol.interfaces import IApplicationControl
-from zope.app.location import Location
-from zope.security.checker import ProxyFactory, NamesChecker
import time
import zope.interface
import zope.traversing.interfaces
+from zope.location import Location
+from zope.security.checker import ProxyFactory, NamesChecker
+from zope.app.applicationcontrol.interfaces import IApplicationControl
class ApplicationControl(Location):
Modified: Zope3/branches/jim-adapter/src/zope/app/authentication/authentication.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/authentication/authentication.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/authentication/authentication.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -16,14 +16,13 @@
$Id$
"""
import zope.interface
-
from zope import component
from zope.schema.interfaces import ISourceQueriables
+from zope.location.interfaces import ILocation
+
from zope.app.security.interfaces import IAuthentication, PrincipalLookupError
-from zope.app.location.interfaces import ILocation
from zope.app.component import queryNextUtility
from zope.app.component.site import SiteManagementFolder
-
from zope.app.authentication import interfaces
Modified: Zope3/branches/jim-adapter/src/zope/app/broken/broken.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/broken/broken.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/broken/broken.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -19,7 +19,7 @@
import ZODB.broken
import zope.interface
-import zope.app.location.interfaces
+import zope.location.interfaces
import zope.security.checker
@@ -32,7 +32,7 @@
class Broken(ZODB.broken.Broken):
zope.interface.implements(
IBroken,
- zope.app.location.interfaces.ILocation,
+ zope.location.interfaces.ILocation,
IAnnotations,
)
@@ -96,7 +96,7 @@
It implements ILocation and IAnnotations::
- >>> zope.app.location.interfaces.ILocation.implementedBy(cls)
+ >>> zope.location.interfaces.ILocation.implementedBy(cls)
True
>>> IAnnotations.implementedBy(cls)
True
Modified: Zope3/branches/jim-adapter/src/zope/app/component/contentdirective.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/contentdirective.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/component/contentdirective.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -25,11 +25,11 @@
from zope.interface import classImplements
from zope.schema.interfaces import IField
from zope.configuration.exceptions import ConfigurationError
+from zope.location.interfaces import ILocation
from zope.app.annotation.interfaces import IAttributeAnnotatable
from zope.app.component.interface import provideInterface
from zope.app.component.interfaces import ILocalUtility
-from zope.app.location.interfaces import ILocation
from zope.app.security.protectclass import protectLikeUnto, protectName
from zope.app.security.protectclass import protectSetAttribute
Modified: Zope3/branches/jim-adapter/src/zope/app/component/site.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/site.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/component/site.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -34,12 +34,12 @@
import zope.traversing.api
import zope.deprecation
import zope.deferredimport
+import zope.location
from zope.component.interfaces import ComponentLookupError
from zope.traversing.interfaces import IContainmentRoot
from zope.security.proxy import removeSecurityProxy
-import zope.app.location
import zope.app.component.back35
from zope.app import zapi
from zope.app.component import interfaces
@@ -140,7 +140,7 @@
class _LocalAdapterRegistry(
zope.component.persistentregistry.PersistentAdapterRegistry,
- zope.app.location.Location,
+ zope.location.Location,
):
pass
Modified: Zope3/branches/jim-adapter/src/zope/app/component/site.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/site.txt 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/component/site.txt 2006-04-05 14:15:32 UTC (rev 66539)
@@ -339,7 +339,7 @@
>>> sys.modules['zope.app.component.tests'].MyUtility = MyUtility
>>> MyUtility.__module__ = 'zope.app.component.tests'
- >>> from zope.app.location.pickling import locationCopy
+ >>> from zope.location.pickling import locationCopy
>>> myfolder['myfolder11'] = locationCopy(myfolder2['myfolder21'])
>>> myfolder11 = myfolder['myfolder11']
Modified: Zope3/branches/jim-adapter/src/zope/app/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/configure.zcml 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/configure.zcml 2006-04-05 14:15:32 UTC (rev 66539)
@@ -26,7 +26,7 @@
<include package="zope.app.copypastemove" />
<include package="zope.size" />
- <include package="zope.app.location" />
+ <include package="zope.location" />
<include package="zope.app.container" />
<include package="zope.app.publisher" />
Modified: Zope3/branches/jim-adapter/src/zope/app/container/browser/adding.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/browser/adding.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/adding.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -28,6 +28,7 @@
from zope.publisher.interfaces import IPublishTraverse
from zope.security.proxy import removeSecurityProxy
from zope.exceptions.interfaces import UserError
+from zope.location import LocationProxy
from zope.app.container.interfaces import IAdding, INameChooser
from zope.app.container.interfaces import IContainerNamesContainer
@@ -36,7 +37,6 @@
from zope.app import zapi
from zope.app.event.objectevent import ObjectCreatedEvent
from zope.app.i18n import ZopeMessageFactory as _
-from zope.app.location import LocationProxy
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.publisher.browser import BrowserView
from zope.app.publisher.browser.menu import getMenu
Modified: Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/container/configure.zcml 2006-04-05 14:15:32 UTC (rev 66539)
@@ -50,7 +50,7 @@
/>
<subscriber
- for="zope.app.location.interfaces.ILocation
+ for="zope.location.interfaces.ILocation
zope.app.container.interfaces.IObjectMovedEvent"
handler=".contained.dispatchToSublocations"
>
@@ -58,7 +58,7 @@
</subscriber>
<adapter
- provides="zope.app.location.interfaces.ISublocations"
+ provides="zope.location.interfaces.ISublocations"
for="zope.app.container.interfaces.IReadContainer"
factory=".contained.ContainerSublocations"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/container/contained.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/contained.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/container/contained.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -17,18 +17,18 @@
"""
__docformat__ = 'restructuredtext'
-from zope.exceptions.interfaces import DuplicationError, UserError
-from zope.security.checker import selectChecker, CombinedChecker
-
+import zope.component
import zope.interface.declarations
+from zope.interface import providedBy
from zope.interface.declarations import getObjectSpecification
from zope.interface.declarations import ObjectSpecification
-from zope.interface import providedBy
-
-from zope.app import zapi
+from zope.event import notify
from zope.component.interfaces import ObjectEvent
+from zope.location.interfaces import ILocation, ISublocations
+from zope.exceptions.interfaces import DuplicationError, UserError
+from zope.security.checker import selectChecker, CombinedChecker
+
from zope.app.event.objectevent import ObjectModifiedEvent
-from zope.event import notify
from zope.app.i18n import ZopeMessageFactory as _
from zope.app.container.interfaces import IContained
from zope.app.container.interfaces import INameChooser
@@ -36,7 +36,6 @@
from zope.app.container.interfaces import IObjectMovedEvent
from zope.app.container.interfaces import IObjectRemovedEvent
from zope.app.container.interfaces import IContainerModifiedEvent
-from zope.app.location.interfaces import ILocation, ISublocations
from zope.app.container._zope_app_container_contained import ContainedProxyBase
from zope.app.container._zope_app_container_contained import getProxiedObject
from zope.app.broken.broken import IBroken
@@ -180,7 +179,7 @@
subs = ISublocations(object, None)
if subs is not None:
for sub in subs.sublocations():
- for ignored in zapi.subscribers((sub, event), None):
+ for ignored in zope.component.subscribers((sub, event), None):
pass # They do work in the adapter fetch
class ContainerSublocations(object):
@@ -282,7 +281,7 @@
`__parent__` and `__name__` attributes *and* declare that it
implements `IContained`:
- >>> from zope.app.location import Location
+ >>> from zope.location import Location
>>> item = Location()
>>> IContained.providedBy(item)
False
@@ -314,7 +313,7 @@
>>> from zope.interface import Interface, directlyProvides
>>> class IOther(Interface):
... pass
- >>> from zope.app.location import Location
+ >>> from zope.location import Location
>>> item = Location()
>>> directlyProvides(item, IOther)
>>> IOther.providedBy(item)
@@ -497,7 +496,7 @@
`__parent__` and `__name__` attributes *and* declare that it
implements `IContained`:
- >>> from zope.app.location import Location
+ >>> from zope.location import Location
>>> item = Location()
>>> IContained.providedBy(item)
0
Modified: Zope3/branches/jim-adapter/src/zope/app/container/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/interfaces.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/container/interfaces.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -20,11 +20,10 @@
from zope.deprecation import deprecated
from zope.interface import Interface, Attribute, Invalid
-from zope.component.interfaces import IView
+from zope.component.interfaces import IView, IObjectEvent
from zope.interface.common.mapping import IItemMapping
from zope.interface.common.mapping import IReadMapping, IEnumerableMapping
-from zope.app.location.interfaces import ILocation
-from zope.component.interfaces import IObjectEvent
+from zope.location.interfaces import ILocation
from zope.app.event.interfaces import IObjectModifiedEvent
deprecated('IContentContainer',
Modified: Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -17,18 +17,18 @@
"""
__docformat__ = 'restructuredtext'
+import zope.component
from zope.interface import implements, Invalid
from zope.exceptions import DuplicationError
from zope.component import adapts
from zope.event import notify
+from zope.location.pickling import locationCopy
+from zope.location.interfaces import ISublocations
-from zope.app import zapi
from zope.app.annotation.interfaces import IAnnotations
from zope.app.annotation.interfaces import IAnnotations
from zope.app.container.sample import SampleContainer
from zope.app.event.objectevent import ObjectCopiedEvent
-from zope.app.location.pickling import locationCopy
-from zope.app.location.interfaces import ISublocations
from zope.app.container.interfaces import IContainer, IOrderedContainer
from zope.app.container.interfaces import IContained
from zope.app.container.interfaces import INameChooser
@@ -707,5 +707,5 @@
subs = ISublocations(object, None)
if subs is not None:
for sub in subs.sublocations():
- for ignored in zapi.subscribers((sub, event), None):
+ for ignored in zope.component.subscribers((sub, event), None):
pass # They do work in the adapter fetch
Modified: Zope3/branches/jim-adapter/src/zope/app/copypastemove/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/copypastemove/configure.zcml 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/copypastemove/configure.zcml 2006-04-05 14:15:32 UTC (rev 66539)
@@ -23,7 +23,7 @@
<adapter factory=".PrincipalClipboard" />
<subscriber
- for="zope.app.location.interfaces.ILocation
+ for="zope.location.interfaces.ILocation
zope.app.event.interfaces.IObjectCopiedEvent"
handler=".dispatchToSublocations"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/opaquenamespaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/opaquenamespaces.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/opaquenamespaces.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -25,8 +25,8 @@
from zope.interface import implements
from zope.interface.common.mapping import IMapping
+from zope.location import Location
from zope.app.annotation.interfaces import IAnnotations, IAnnotatable
-from zope.app.location import Location
from BTrees.OOBTree import OOBTree
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/test_adapter.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -17,6 +17,9 @@
"""
import unittest
+import zope.location
+from zope.location.interfaces import ILocation
+from zope.location.traversing import LocationPhysicallyLocatable
from zope.testing.doctestunit import DocTestSuite
from zope.interface import Interface, implements
from zope.size.interfaces import ISized
@@ -27,9 +30,6 @@
from zope.app.filerepresentation.interfaces import IReadDirectory
from zope.app.i18n import ZopeMessageFactory as _
-import zope.app.location
-from zope.app.location.interfaces import ILocation
-from zope.app.location.traversing import LocationPhysicallyLocatable
from zope.app.annotation.interfaces import IAnnotatable, IAttributeAnnotatable
from zope.app.annotation.interfaces import IAnnotations
from zope.app.annotation.attribute import AttributeAnnotations
@@ -39,7 +39,7 @@
class IRobot(Interface):
pass
-class Robot(zope.app.location.Location):
+class Robot(zope.location.Location):
implements(IRobot, IAttributeAnnotatable)
class RobotSize(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/dav/tests/unitfixtures.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -17,6 +17,7 @@
"""
__docformat__ = 'restructuredtext'
+import zope.location
from persistent import Persistent
from zope.interface import implements
@@ -26,10 +27,8 @@
from zope.app.annotation.interfaces import IAnnotatable
from zope.app.file.interfaces import IFile
-import zope.app.location
+class Folder(zope.location.Location, Persistent):
-class Folder(zope.app.location.Location, Persistent):
-
implements(IReadContainer, IReadDirectory)
def __init__(self, name, level=0, parent=None):
@@ -48,7 +47,7 @@
Folder('sub1', level=self.level+1, parent=self)))
return tuple(result)
-class File(zope.app.location.Location, Persistent):
+class File(zope.location.Location, Persistent):
implements(IWriteFile, IFile)
@@ -62,7 +61,7 @@
def write(self, data):
self.data = data
-class FooZPT(zope.app.location.Location, Persistent):
+class FooZPT(zope.location.Location, Persistent):
implements(IAnnotatable)
Modified: Zope3/branches/jim-adapter/src/zope/app/demo/passwdauth/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/demo/passwdauth/__init__.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/demo/passwdauth/__init__.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -22,12 +22,12 @@
import os
from persistent import Persistent
+from zope.interface import implements
+from zope.location import locate
from zope.app.container.contained import Contained
-from zope.app.location import locate
from zope.app.pluggableauth import SimplePrincipal
from zope.app.pluggableauth.interfaces import ILoginPasswordPrincipalSource
from zope.app.security.interfaces import PrincipalLookupError
-from zope.interface import implements
from interfaces import IFileBasedPrincipalSource
class PasswdPrincipalSource(Contained, Persistent):
Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -19,10 +19,10 @@
from persistent.dict import PersistentDict
+from zope.location import Location
from zope.app.annotation.interfaces import IAnnotations, IAnnotatable
from zope.app.dublincore.zopedublincore import ZopeDublinCore
from zope.app.dublincore.zopedublincore import DateProperty, ScalarProperty
-from zope.app.location import Location
DCkey = "zope.app.dublincore.ZopeDublinCore"
Modified: Zope3/branches/jim-adapter/src/zope/app/folder/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/folder/configure.zcml 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/folder/configure.zcml 2006-04-05 14:15:32 UTC (rev 66539)
@@ -46,7 +46,7 @@
/>
<adapter
- provides="zope.app.location.interfaces.ISublocations"
+ provides="zope.location.interfaces.ISublocations"
for=".interfaces.IFolder"
factory=".folder.FolderSublocations"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_editview.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_editview.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_editview.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -22,6 +22,7 @@
from zope.schema import TextLine, accessors
from zope.schema.interfaces import ITextLine
from zope.component.interfaces import ComponentLookupError
+from zope.location.interfaces import ILocation
from zope.app.testing import ztapi
from zope.app.testing.placelesssetup import PlacelessSetup
@@ -30,10 +31,8 @@
from zope.app.form.browser import TextWidget
from zope.app.form.browser.editview import EditView
from zope.app.form.browser.submit import Update
-from zope.component.interfaces import ComponentLookupError
from zope.app.form.interfaces import IInputWidget
from zope.app.form.tests import utils
-from zope.app.location.interfaces import ILocation
class I(Interface):
foo = TextLine(title=u"Foo")
Modified: Zope3/branches/jim-adapter/src/zope/app/fssync/fspickle.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/fssync/fspickle.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/fssync/fspickle.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -25,7 +25,7 @@
`loads()` function. The name of the outermost object is not stored in
the pickle unless it is stored in the object.
->>> from zope.app.location.tests import TLocation
+>>> from zope.location.tests import TLocation
>>> root = TLocation()
>>> zope.interface.directlyProvides(root, IContainmentRoot)
>>> o1 = DataLocation('o1', root, 12)
@@ -67,14 +67,13 @@
from cStringIO import StringIO
import zope.interface
+from zope import location
+from zope.location.interfaces import ILocation
+from zope.location.traversing import LocationPhysicallyLocatable
+from zope.location.tests import TLocation
from zope.traversing.interfaces import IContainmentRoot
from zope.traversing.interfaces import ITraverser
-from zope.app import location
-from zope.app.location.interfaces import ILocation
-from zope.app.location.traversing import LocationPhysicallyLocatable
-from zope.app.location.tests import TLocation
-
PARENT_MARKER = ".."
# We're not ready to use protocol 2 yet; this can be changed when
@@ -108,7 +107,7 @@
class ParentPersistentIdGenerator(object):
"""
- >>> from zope.app.location.tests import TLocation
+ >>> from zope.location.tests import TLocation
>>> root = TLocation()
>>> zope.interface.directlyProvides(root, IContainmentRoot)
>>> o1 = TLocation(); o1.__parent__ = root; o1.__name__ = 'o1'
Modified: Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_committer.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_committer.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_committer.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -25,6 +25,7 @@
from zope.traversing.interfaces import TraversalError, IContainmentRoot
from zope.traversing.interfaces import ITraversable, ITraverser
from zope.xmlpickle import loads, dumps
+from zope.location import Location
from zope.fssync import fsutil
from zope.fssync.server.entryadapter import DefaultFileAdpater
@@ -36,7 +37,6 @@
from zope.app.container.interfaces import IContainer
from zope.app.filerepresentation.interfaces import IFileFactory
from zope.app.filerepresentation.interfaces import IDirectoryFactory
-from zope.app.location import Location
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.fssync import committer, syncer # The module
Modified: Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_fspickle.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_fspickle.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/fssync/tests/test_fspickle.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -19,8 +19,8 @@
from zope.testing.doctestunit import DocTestSuite
from zope.interface import directlyProvides
from zope.traversing.interfaces import IContainmentRoot
+from zope.location.tests import TLocation
-from zope.app.location.tests import TLocation
from zope.app.fssync import fspickle
class PersistentLoaderTestCase(unittest.TestCase):
Modified: Zope3/branches/jim-adapter/src/zope/app/intid/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/intid/__init__.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/intid/__init__.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -28,11 +28,11 @@
from zope.event import notify
from zope.interface import implements
from zope.security.proxy import removeSecurityProxy
+from zope.location.interfaces import ILocation
from zope.app import zapi
from zope.app.container.contained import Contained
from zope.app.keyreference.interfaces import IKeyReference, NotYet
-from zope.app.location.interfaces import ILocation
from zope.app.intid.interfaces import IIntIds
from zope.app.intid.interfaces import IntIdRemovedEvent
Modified: Zope3/branches/jim-adapter/src/zope/app/intid/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/intid/configure.zcml 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/intid/configure.zcml 2006-04-05 14:15:32 UTC (rev 66539)
@@ -27,13 +27,13 @@
<subscriber
handler=".removeIntIdSubscriber"
- for="zope.app.location.interfaces.ILocation
+ for="zope.location.interfaces.ILocation
zope.app.container.interfaces.IObjectRemovedEvent"
/>
<subscriber
handler=".addIntIdSubscriber"
- for="zope.app.location.interfaces.ILocation
+ for="zope.location.interfaces.ILocation
zope.app.container.interfaces.IObjectAddedEvent"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/intid/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/intid/tests.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/intid/tests.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -23,10 +23,10 @@
from zope.interface import implements
from zope.interface.verify import verifyObject
+from zope.location.interfaces import ILocation
from zope.app.testing import setup, ztapi
from zope.app import zapi
-from zope.app.location.interfaces import ILocation
from zope.app.component.hooks import setSite
from zope.app.intid.interfaces import IIntIds
Modified: Zope3/branches/jim-adapter/src/zope/app/onlinehelp/tests/test_helpdirectives.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/onlinehelp/tests/test_helpdirectives.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/onlinehelp/tests/test_helpdirectives.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -25,6 +25,7 @@
from zope.traversing.interfaces import IPhysicallyLocatable
from zope.traversing.interfaces import ITraverser, ITraversable
from zope.traversing.adapters import Traverser, DefaultTraversable
+from zope.location.traversing import LocationPhysicallyLocatable
import zope.app.component
import zope.app.security
@@ -37,7 +38,6 @@
from zope.app.onlinehelp.onlinehelptopic import ZPTOnlineHelpTopic
from zope.app.security.interfaces import IPermission
from zope.app.security.permission import Permission
-from zope.app.location.traversing import LocationPhysicallyLocatable
from zope.app.testing import ztapi, placelesssetup
Modified: Zope3/branches/jim-adapter/src/zope/app/onlinehelp/tests/test_onlinehelp.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/onlinehelp/tests/test_onlinehelp.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/onlinehelp/tests/test_onlinehelp.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -23,9 +23,9 @@
from zope.traversing.interfaces import ITraversable, ITraverser
from zope.traversing.interfaces import IPhysicallyLocatable
from zope.traversing.adapters import Traverser, DefaultTraversable
+from zope.location.traversing import LocationPhysicallyLocatable
from zope.app.testing import ztapi, placelesssetup
-from zope.app.location.traversing import LocationPhysicallyLocatable
class I1(Interface):
pass
Modified: Zope3/branches/jim-adapter/src/zope/app/pluggableauth/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/pluggableauth/__init__.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/pluggableauth/__init__.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -32,6 +32,8 @@
from zope.interface import implements
from zope.component.interfaces import IViewFactory
from zope.deprecation import deprecated
+from zope.traversing.api import getPath
+from zope.location import locate
from zope.app import zapi
from zope.app.component import queryNextUtility
@@ -42,10 +44,8 @@
from zope.app.container.constraints import ContainerTypesConstraint
from zope.app.container.contained import Contained, setitem, uncontained
from zope.app.container.ordered import OrderedContainer
-from zope.app.location import locate
from zope.app.security.interfaces import ILoginPassword, IAuthentication
from zope.app.security.interfaces import PrincipalLookupError
-from zope.traversing.api import getPath
from interfaces import IUserSchemafied, IPluggableAuthentication
from interfaces import IPrincipalSource, ILoginPasswordPrincipalSource
Modified: Zope3/branches/jim-adapter/src/zope/app/preference/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/preference/README.txt 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/preference/README.txt 2006-04-05 14:15:32 UTC (rev 66539)
@@ -404,7 +404,7 @@
This function is also commonly registered as an adapter,
- >>> from zope.app.location.interfaces import ILocation
+ >>> from zope.location.interfaces import ILocation
>>> ztapi.provideAdapter(ILocation, interfaces.IUserPreferences,
... UserPreferences)
Modified: Zope3/branches/jim-adapter/src/zope/app/preference/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/preference/configure.zcml 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/preference/configure.zcml 2006-04-05 14:15:32 UTC (rev 66539)
@@ -21,7 +21,7 @@
/>
<adapter
- for="zope.app.location.interfaces.ILocation"
+ for="zope.location.interfaces.ILocation"
provides=".interfaces.IUserPreferences"
factory=".preference.UserPreferences"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/preference/default.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/preference/default.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/preference/default.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -23,10 +23,10 @@
import zope.component
from zope.security.checker import defineChecker
from zope.traversing.interfaces import IContainmentRoot
+from zope.location import locate
import zope.app.component
from zope.app.container.contained import Contained
-from zope.app.location import locate
from zope.app.preference import preference, interfaces
class DefaultPreferenceProvider(persistent.Persistent, Contained):
Modified: Zope3/branches/jim-adapter/src/zope/app/preference/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/preference/interfaces.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/preference/interfaces.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -20,11 +20,10 @@
import zope.interface
import zope.schema
from zope.configuration.fields import MessageID
+from zope.location.interfaces import ILocation
from zope.app.container.interfaces import IReadContainer
-from zope.app.location.interfaces import ILocation
-
class IPreferenceGroup(ILocation):
"""A group of preferences.
Modified: Zope3/branches/jim-adapter/src/zope/app/preference/preference.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/preference/preference.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/preference/preference.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -23,12 +23,12 @@
from zope.security.checker import CheckerPublic, Checker, defineChecker
from zope.security.management import getInteraction
from zope.traversing.interfaces import IContainmentRoot
+from zope.location import LocationProxy, locate, Location
import zope.app.component.hooks
from zope.app import zapi
from zope.app.container.contained import Contained
from zope.app.container.interfaces import IReadContainer
-from zope.app.location import LocationProxy, locate, Location
from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
from zope.app.preference.interfaces import IPreferenceGroup
Modified: Zope3/branches/jim-adapter/src/zope/app/principalannotation/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/principalannotation/__init__.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/principalannotation/__init__.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -22,12 +22,12 @@
from persistent import Persistent
from persistent.dict import PersistentDict
from BTrees.OOBTree import OOBTree
+import zope.security.interfaces
from zope import interface, component
-import zope.security.interfaces
+from zope.location import Location
from zope.app.annotation.interfaces import IAnnotations
from zope.app.container.contained import Contained
-from zope.app.location import Location
from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
from zope.app.component import queryNextUtility
Modified: Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_zopepublication.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_zopepublication.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_zopepublication.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -24,6 +24,7 @@
from ZODB.DemoStorage import DemoStorage
import transaction
+import zope.component
from zope.interface.verify import verifyClass
from zope.interface import implements, classImplements, implementedBy
from zope.i18n.interfaces import IUserPreferredCharsets
@@ -35,18 +36,17 @@
from zope.security.management import setSecurityPolicy, queryInteraction
from zope.security.management import endInteraction
from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.location.interfaces import ILocation
-from zope.app import zapi
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.testing import setup, ztapi
from zope.app.error.interfaces import IErrorReportingUtility
-from zope.app.location.interfaces import ILocation
from zope.app.security.principalregistry import principalRegistry
from zope.app.security.interfaces import IUnauthenticatedPrincipal, IPrincipal
from zope.app.publication.zopepublication import ZopePublication
from zope.app.folder import Folder, rootFolder
-from zope.app.location import Location
+from zope.location import Location
from zope.app.security.interfaces import IAuthenticationUtility
class Principal(object):
@@ -378,7 +378,7 @@
def testAbortTransactionWithErrorReportingUtility(self):
# provide our fake error reporting utility
- sm = zapi.getGlobalSiteManager()
+ sm = zope.component.getGlobalSiteManager()
sm.provideUtility(IErrorReportingUtility, ErrorReportingUtility())
class FooError(Exception):
@@ -397,7 +397,7 @@
self.assertEqual(last_txn_info, new_txn_info)
# instead, we expect a message in our logging utility
- error_log = zapi.getUtility(IErrorReportingUtility)
+ error_log = zope.component.getUtility(IErrorReportingUtility)
self.assertEqual(len(error_log.exceptions), 1)
error_info, request = error_log.exceptions[0]
self.assertEqual(error_info[0], FooError)
@@ -467,8 +467,8 @@
def testTransactionAnnotation(self):
from zope.interface import directlyProvides
- from zope.app.location.traversing import LocationPhysicallyLocatable
- from zope.app.location.interfaces import ILocation
+ from zope.location.traversing import LocationPhysicallyLocatable
+ from zope.location.interfaces import ILocation
from zope.traversing.interfaces import IPhysicallyLocatable
from zope.traversing.interfaces import IContainmentRoot
ztapi.provideAdapter(ILocation, IPhysicallyLocatable,
Modified: Zope3/branches/jim-adapter/src/zope/app/publication/zopepublication.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publication/zopepublication.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/publication/zopepublication.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -34,13 +34,13 @@
from zope.security.checker import ProxyFactory
from zope.security.proxy import removeSecurityProxy
from zope.traversing.interfaces import IPhysicallyLocatable
+from zope.location import LocationProxy
from zope.app import zapi
from zope.app.applicationcontrol.applicationcontrol \
import applicationControllerRoot
from zope.app.error.interfaces import IErrorReportingUtility
from zope.app.exception.interfaces import ISystemErrorView
-from zope.app.location import LocationProxy
from zope.app.publication.interfaces import BeforeTraverseEvent
from zope.app.publication.interfaces import EndRequestEvent
from zope.app.publication.publicationtraverse import PublicationTraverse
Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/browser/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/browser/__init__.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/browser/__init__.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -23,8 +23,8 @@
from zope.publisher.browser import BrowserLanguages
from zope.i18n.interfaces import IUserPreferredLanguages
from zope.i18n.interfaces import IModifiableUserPreferredLanguages
+from zope.location import Location
-from zope.app.location import Location
from zope.app.publisher.interfaces.browser import IBrowserView
key = "zope.app.publisher.browser.IUserPreferredLanguages"
Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/browser/resource.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/browser/resource.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/browser/resource.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -19,9 +19,9 @@
from zope.component.interfaces import IResource
from zope.interface import implements
from zope.traversing.browser.interfaces import IAbsoluteURL
+from zope.location import Location
from zope.app.component.hooks import getSite
-from zope.app.location import Location
class Resource(Location):
implements(IResource)
Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/browser/resources.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/browser/resources.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/browser/resources.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -15,13 +15,13 @@
$Id$
"""
-from zope.app.publisher.browser import BrowserView
+import zope.component
from zope.publisher.interfaces.browser import IBrowserPublisher
from zope.publisher.interfaces import NotFound
from zope.interface import implements
+from zope.location import locate
-from zope.app import zapi
-from zope.app.location import locate
+from zope.app.publisher.browser import BrowserView
class Resources(BrowserView):
"""Provide a URL-accessible resource namespace
@@ -32,11 +32,11 @@
def publishTraverse(self, request, name):
'''See interface IBrowserPublisher'''
- resource = zapi.queryAdapter(request, name=name)
+ resource = zope.component.queryAdapter(request, name=name)
if resource is None:
raise NotFound(self, name)
- sm = zapi.getSiteManager()
+ sm = zope.component.getSiteManager()
locate(resource, sm, name)
return resource
Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/README.txt 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/README.txt 2006-04-05 14:15:32 UTC (rev 66539)
@@ -144,7 +144,7 @@
particulat, it has an adapter that simply traverses to attributes.
If an XML-RPC view isn't going to be public, then it also has to
-implement 'zope.app.location.ILocation' so that security grants can be
+implement 'zope.location.ILocation' so that security grants can be
acquired for it, at least with Zope's default security policy. The
`MethodPublisher` class does that too.
Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/__init__.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/xmlrpc/__init__.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -18,9 +18,9 @@
$Id$
"""
import zope.interface
-import zope.app.location
+import zope.location
+import zope.publisher.interfaces.xmlrpc
import zope.app.publisher.interfaces.xmlrpc
-import zope.publisher.interfaces.xmlrpc
class XMLRPCView(object):
"""A base XML-RPC view that can be used as mix-in for XML-RPC views."""
@@ -35,7 +35,7 @@
"""
# Need to test new __parent__ attribute
-class MethodPublisher(XMLRPCView, zope.app.location.Location):
+class MethodPublisher(XMLRPCView, zope.location.Location):
"""Base class for very simple XML-RPC views that publish methods
This class is meant to be more of an example than a standard base class.
Modified: Zope3/branches/jim-adapter/src/zope/app/pythonpage/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/pythonpage/tests.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/pythonpage/tests.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -23,11 +23,11 @@
from zope.traversing.interfaces import IContainmentRoot
from zope.traversing.interfaces import IPhysicallyLocatable
from zope.traversing.adapters import RootPhysicallyLocatable
+from zope.location.traversing import LocationPhysicallyLocatable
from zope.app.container.contained import Contained
from zope.app.interpreter.interfaces import IInterpreter
from zope.app.interpreter.python import PythonInterpreter
-from zope.app.location.traversing import LocationPhysicallyLocatable
from zope.app.testing import placelesssetup, ztapi
class Root(Contained):
Modified: Zope3/branches/jim-adapter/src/zope/app/schema/browser/traversal.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/schema/browser/traversal.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/schema/browser/traversal.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -18,9 +18,9 @@
from zope.publisher.interfaces import NotFound
from zope.traversing.interfaces import TraversalError, ITraversable
from zope.traversing.namespace import UnexpectedParameters
+from zope.location.interfaces import ILocation
from zope.app import zapi
-from zope.app.location.interfaces import ILocation
from zope.app.schema.interfaces import IMutableSchema
_marker = object()
Modified: Zope3/branches/jim-adapter/src/zope/app/security/adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/security/adapter.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/security/adapter.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -18,9 +18,8 @@
from zope.security.checker import ProxyFactory
from zope.security.proxy import removeSecurityProxy
-from zope.app.location import ILocation, Location, LocationProxy
+from zope.location import ILocation, Location, LocationProxy
-
def assertLocation(adapter, parent):
"""Assert locatable adapters.
Modified: Zope3/branches/jim-adapter/src/zope/app/security/permission.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/security/permission.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/security/permission.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -17,11 +17,11 @@
"""
from persistent import Persistent
from zope.interface import implements
+from zope.component import queryUtility, getUtilitiesFor
from zope.schema.interfaces import ValidationError
from zope.security.checker import CheckerPublic
-from zope.app import zapi
-from zope.app.location import Location
-from zope.app.security.interfaces import IPermission
+from zope.location import Location
+from zope.security.interfaces import IPermission
from zope.app.i18n import ZopeMessageFactory as _
NULL_ID = _('<permission not activated>')
@@ -120,7 +120,7 @@
"""
if permission_id is CheckerPublic:
return
- if not zapi.queryUtility(IPermission, permission_id, context=context):
+ if not queryUtility(IPermission, permission_id, context=context):
raise ValueError("Undefined permission id", permission_id)
def allPermissions(context=None):
@@ -140,6 +140,6 @@
>>> tearDown()
"""
- for id, permission in zapi.getUtilitiesFor(IPermission, context):
+ for id, permission in getUtilitiesFor(IPermission, context):
if id != u'zope.Public':
yield id
Modified: Zope3/branches/jim-adapter/src/zope/app/securitypolicy/role.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/securitypolicy/role.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/securitypolicy/role.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -17,9 +17,9 @@
"""
from persistent import Persistent
from zope.interface import implements
+from zope.component import getUtilitiesFor
+from zope.location import Location
-from zope.app import zapi
-from zope.app.location import Location
from zope.app.securitypolicy.interfaces import IRole
from zope.app.i18n import ZopeMessageFactory as _
@@ -100,6 +100,6 @@
def checkRole(context, role_id):
- names = [name for name, util in zapi.getUtilitiesFor(IRole, context)]
+ names = [name for name, util in getUtilitiesFor(IRole, context)]
if not role_id in names:
raise ValueError("Undefined role id", role_id)
Modified: Zope3/branches/jim-adapter/src/zope/app/testing/setup.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/testing/setup.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/testing/setup.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -54,7 +54,7 @@
from zope.traversing.adapters import DefaultTraversable
from zope.traversing.adapters import Traverser, RootPhysicallyLocatable
from zope.traversing.namespace import etc
-from zope.app.location.traversing import LocationPhysicallyLocatable
+from zope.location.traversing import LocationPhysicallyLocatable
from zope.app.container.traversal import ContainerTraversable
from zope.app.container.interfaces import ISimpleReadContainer
Modified: Zope3/branches/jim-adapter/src/zope/app/tree/adapters.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/tree/adapters.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/tree/adapters.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -24,9 +24,9 @@
from zope.component.interfaces import ComponentLookupError
from zope.security import canAccess
from zope.security.interfaces import Unauthorized
+from zope.location.interfaces import ILocation
from zope.app import zapi
-from zope.app.location.interfaces import ILocation
from zope.app.container.interfaces import IReadContainer
from zope.app.component.interfaces import ISite
Modified: Zope3/branches/jim-adapter/src/zope/app/tree/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/tree/configure.zcml 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/tree/configure.zcml 2006-04-05 14:15:32 UTC (rev 66539)
@@ -30,7 +30,7 @@
<adapter
provides=".interfaces.IUniqueId"
- for="zope.app.location.interfaces.ILocation"
+ for="zope.location.interfaces.ILocation"
factory=".adapters.LocationUniqueId"
/>
Modified: Zope3/branches/jim-adapter/src/zope/app/tree/tests/test_adapters.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/tree/tests/test_adapters.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/tree/tests/test_adapters.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -22,11 +22,10 @@
from zope.security.checker import defineChecker
from zope.security.checker import NamesChecker
from zope.traversing.interfaces import IContainmentRoot
+from zope.location.interfaces import ILocation
-from zope.app.location.interfaces import ILocation
-from zope.app.container.interfaces import IReadContainer
from zope.app.component.interfaces import ISite
-
+from zope.app.container.interfaces import IReadContainer
from zope.app.container.sample import SampleContainer
from zope.app.container.contained import setitem
from zope.app.testing.placelesssetup import PlacelessSetup
Modified: Zope3/branches/jim-adapter/src/zope/app/undo/tests/test_zodbundomanager.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/undo/tests/test_zodbundomanager.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/undo/tests/test_zodbundomanager.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -83,8 +83,8 @@
super(Test, self).setUp()
# provide location adapter
- from zope.app.location.traversing import LocationPhysicallyLocatable
- from zope.app.location.interfaces import ILocation
+ from zope.location.traversing import LocationPhysicallyLocatable
+ from zope.location.interfaces import ILocation
from zope.traversing.interfaces import IPhysicallyLocatable
ztapi.provideAdapter(ILocation, IPhysicallyLocatable,
LocationPhysicallyLocatable)
@@ -111,7 +111,7 @@
def testGetTransactionsInLocation(self):
from zope.interface import directlyProvides
- from zope.app.location import Location
+ from zope.location import Location
from zope.traversing.interfaces import IContainmentRoot
root = Location()
Modified: Zope3/branches/jim-adapter/src/zope/app/versioncontrol/history.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/versioncontrol/history.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/versioncontrol/history.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -24,7 +24,7 @@
from BTrees.IIBTree import IIBTree
from BTrees.OOBTree import OOBTree
-import zope.app.location
+import zope.location
import zope.app.versioncontrol.utility
import zope.app.versioncontrol.version
@@ -32,7 +32,7 @@
from zope.app.versioncontrol.interfaces import VersionControlError
-class VersionHistory(persistent.Persistent, zope.app.location.Location):
+class VersionHistory(persistent.Persistent, zope.location.Location):
"""A version history maintains the information about the changes
to a particular version-controlled resource over time."""
@@ -216,7 +216,7 @@
return self._versions.keys()
-class BranchInfo(persistent.Persistent, zope.app.location.Location):
+class BranchInfo(persistent.Persistent, zope.location.Location):
"""A utility class to hold branch (line-of-descent) information.
It maintains the name of the branch, the version id of the root of
Modified: Zope3/branches/jim-adapter/src/zope/app/versioncontrol/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/versioncontrol/tests.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/versioncontrol/tests.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -21,6 +21,7 @@
from transaction import abort
import zope.event
+import zope.location
import zope.traversing.interfaces
from zope import component, interface
from zope.component.testing import PlacelessSetup
@@ -28,7 +29,6 @@
import zope.app.annotation.interfaces
import zope.app.annotation.attribute
-import zope.app.location
import zope.app.versioncontrol.version
from zope.app.versioncontrol import interfaces, nonversioned
@@ -55,7 +55,7 @@
print event
-class L(persistent.Persistent, zope.app.location.Location):
+class L(persistent.Persistent, zope.location.Location):
interface.implements(interfaces.IVersionable,
zope.app.annotation.interfaces.IAttributeAnnotatable,
zope.traversing.interfaces.IPhysicallyLocatable,
@@ -115,14 +115,14 @@
"""\
cloneByPickle should not go outside a location
- >>> parent = zope.app.location.Location()
+ >>> parent = zope.location.Location()
>>> parent.poison = lambda: None
- >>> ob = zope.app.location.Location()
+ >>> ob = zope.location.Location()
>>> ob.__parent__ = parent
- >>> x = zope.app.location.Location()
+ >>> x = zope.location.Location()
>>> x.poison = lambda: None
>>> ob.x = x
- >>> ob.y = zope.app.location.Location()
+ >>> ob.y = zope.location.Location()
>>> ob.y.__parent__ = ob
>>> clone = zope.app.versioncontrol.version.cloneByPickle(ob)
>>> clone.__parent__ is ob.__parent__
Modified: Zope3/branches/jim-adapter/src/zope/app/versioncontrol/utility.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/versioncontrol/utility.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/versioncontrol/utility.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -24,6 +24,7 @@
from ZODB.serialize import referencesf
from ZODB.TimeStamp import TimeStamp
+import zope.location
import zope.security.management
import zope.app.versioncontrol.interfaces
@@ -82,8 +83,8 @@
return None
# TODO obviously no test for this
- if (zope.app.location.ILocation.providedBy(ob)
- and not zope.app.location.inside(ob, object)):
+ if (zope.location.ILocation.providedBy(ob)
+ and not zope.location.inside(ob, object)):
return '1' # go away
# The location check above should wake the object
Modified: Zope3/branches/jim-adapter/src/zope/app/versioncontrol/version.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/versioncontrol/version.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/versioncontrol/version.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -24,7 +24,7 @@
from BTrees.OOBTree import OOBTree
-import zope.app.location
+import zope.location
from zope.app.versioncontrol.interfaces import VersionControlError
from zope.app.versioncontrol.interfaces import INonVersionedData
@@ -45,8 +45,8 @@
if ignore_dict.has_key(id(ob)):
return 'ignored'
- if (zope.app.location.ILocation.providedBy(ob)
- and not zope.app.location.inside(ob, obj)):
+ if (zope.location.ILocation.providedBy(ob)
+ and not zope.location.inside(ob, obj)):
myid = id(ob)
ids[myid] = ob
return myid
@@ -68,7 +68,7 @@
return u.load()
-class Version(persistent.Persistent, zope.app.location.Location):
+class Version(persistent.Persistent, zope.location.Location):
"""A Version is a resource that contains a copy of a particular state
(content and dead properties) of a version-controlled resource. A
version is created by checking in a checked-out resource. The state
Modified: Zope3/branches/jim-adapter/src/zope/app/zptpage/tests/test_zptpage.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/zptpage/tests/test_zptpage.py 2006-04-05 14:15:37 UTC (rev 66538)
+++ Zope3/branches/jim-adapter/src/zope/app/zptpage/tests/test_zptpage.py 2006-04-05 14:15:32 UTC (rev 66539)
@@ -29,12 +29,12 @@
from zope.traversing.interfaces import IPhysicallyLocatable
from zope.traversing.interfaces import IContainmentRoot
from zope.security.checker import NamesChecker, defineChecker
+from zope.location.traversing import LocationPhysicallyLocatable
from zope.app.testing import ztapi
from zope.app.publisher.browser import BrowserView
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.container.contained import contained
-from zope.app.location.traversing import LocationPhysicallyLocatable
from zope.app.zptpage.interfaces import IZPTPage
from zope.app.zptpage.zptpage import ZPTPage, ZPTSourceView,\
More information about the Checkins
mailing list