[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/location/ Adjust import paths to new location

[Philipp von Weitershausen]

Log message for revision 66534:
  Adjust import paths to new location
  

Changed:
  U   Zope3/branches/jim-adapter/src/zope/location/__init__.py
  U   Zope3/branches/jim-adapter/src/zope/location/configure.zcml
  U   Zope3/branches/jim-adapter/src/zope/location/location.py
  U   Zope3/branches/jim-adapter/src/zope/location/pickling.py
  U   Zope3/branches/jim-adapter/src/zope/location/tests.py
  U   Zope3/branches/jim-adapter/src/zope/location/traversing.py

-=-
Modified: Zope3/branches/jim-adapter/src/zope/location/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/location/__init__.py	2006-04-05 14:08:18 UTC (rev 66533)
+++ Zope3/branches/jim-adapter/src/zope/location/__init__.py	2006-04-05 14:09:33 UTC (rev 66534)
@@ -17,6 +17,6 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.app.location.location import Location, locate, LocationIterator
-from zope.app.location.location import inside, LocationProxy
-from zope.app.location.interfaces import ILocation
+from zope.location.location import Location, locate, LocationIterator
+from zope.location.location import inside, LocationProxy
+from zope.location.interfaces import ILocation

Modified: Zope3/branches/jim-adapter/src/zope/location/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/location/configure.zcml	2006-04-05 14:08:18 UTC (rev 66533)
+++ Zope3/branches/jim-adapter/src/zope/location/configure.zcml	2006-04-05 14:09:33 UTC (rev 66534)
@@ -4,9 +4,9 @@
     >
 
   <adapter 
-      for="zope.app.location.interfaces.ILocation"
+      for="zope.location.interfaces.ILocation"
       provides="zope.traversing.interfaces.IPhysicallyLocatable"
-      factory="zope.app.location.traversing.LocationPhysicallyLocatable" 
+      factory="zope.location.traversing.LocationPhysicallyLocatable" 
       />
 
 </configure>

Modified: Zope3/branches/jim-adapter/src/zope/location/location.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/location/location.py	2006-04-05 14:08:18 UTC (rev 66533)
+++ Zope3/branches/jim-adapter/src/zope/location/location.py	2006-04-05 14:09:33 UTC (rev 66534)
@@ -18,7 +18,7 @@
 __docformat__ = 'restructuredtext'
 
 import zope.interface
-from zope.app.location.interfaces import ILocation
+from zope.location.interfaces import ILocation
 from zope.proxy import ProxyBase, getProxiedObject, non_overridable
 from zope.decorator import DecoratorSpecificationDescriptor
 from zope.decorator import DecoratedSecurityCheckerDescriptor
@@ -31,8 +31,8 @@
     >>> from zope.interface import implements, Interface
     >>> from zope.schema import Object
     >>> from zope.schema.fieldproperty import FieldProperty
-    >>> from zope.app.location.interfaces import ILocation
-    >>> from zope.app.location.location import Location
+    >>> from zope.location.interfaces import ILocation
+    >>> from zope.location.location import Location
 
     >>> class IA(Interface):
     ...     location = Object(schema=ILocation, required=False, default=None)

Modified: Zope3/branches/jim-adapter/src/zope/location/pickling.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/location/pickling.py	2006-04-05 14:08:18 UTC (rev 66533)
+++ Zope3/branches/jim-adapter/src/zope/location/pickling.py	2006-04-05 14:09:33 UTC (rev 66534)
@@ -23,9 +23,9 @@
 from zope.traversing.interfaces import IContainmentRoot
 from zope.traversing.interfaces import ITraverser
 
-from zope.app.location.interfaces import ILocation
-from zope.app.location.location import Location, inside
-from zope.app.location.traversing import LocationPhysicallyLocatable
+from zope.location.interfaces import ILocation
+from zope.location.location import Location, inside
+from zope.location.traversing import LocationPhysicallyLocatable
 
 def locationCopy(loc):
     r"""Return a copy of an object, and anything in it
@@ -171,7 +171,7 @@
 
     We require outside locations that can be adapted to `ITraversable`.
     To simplify the example, we'll use a simple traversable location
-    defined in `zope.app.location.tests`, `TLocation`.
+    defined in `zope.location.tests`, `TLocation`.
 
     Normally, general adapters are used to make objects traversable.
 
@@ -193,7 +193,7 @@
     But, if we get a location outside the original location, we return it's
     path. To compute it's path, it must be rooted:
 
-    >>> from zope.app.location.tests import TLocation
+    >>> from zope.location.tests import TLocation
     >>> root = TLocation()
     >>> zope.interface.directlyProvides(root, IContainmentRoot)
     >>> o3 = TLocation(); o3.__name__ = 'o3'

Modified: Zope3/branches/jim-adapter/src/zope/location/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/location/tests.py	2006-04-05 14:08:18 UTC (rev 66533)
+++ Zope3/branches/jim-adapter/src/zope/location/tests.py	2006-04-05 14:09:33 UTC (rev 66534)
@@ -19,7 +19,7 @@
 import zope.interface
 from zope.traversing.interfaces import ITraverser
 from zope.testing.doctestunit import DocTestSuite
-from zope.app.location.location import Location
+from zope.location.location import Location
 
 class TLocation(Location):
     """Simple traversable location used in examples."""
@@ -34,14 +34,10 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocTestSuite('zope.app.location.location'),
-        DocTestSuite('zope.app.location.traversing'),
-        DocTestSuite('zope.app.location.pickling'),
+        DocTestSuite('zope.location.location'),
+        DocTestSuite('zope.location.traversing'),
+        DocTestSuite('zope.location.pickling'),
         ))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')
-
-
-
-

Modified: Zope3/branches/jim-adapter/src/zope/location/traversing.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/location/traversing.py	2006-04-05 14:08:18 UTC (rev 66533)
+++ Zope3/branches/jim-adapter/src/zope/location/traversing.py	2006-04-05 14:09:33 UTC (rev 66534)
@@ -21,7 +21,7 @@
 from zope.traversing.interfaces import ITraverser
 from zope.traversing.api import getParents
 from zope.app.component.interfaces import ISite
-from zope.app.location.location import Location
+from zope.location.location import Location
 
 
 class LocationPhysicallyLocatable(object):