[Checkins] SVN: zope.location/trunk/ Removed dependency on zope.deferredimport.

[Fabio Tranchitella]

Log message for revision 103311:
  Removed dependency on zope.deferredimport.
  
  - New feature release: deprecated locationCopy, CopyPersistent and
    PathPersistent from zope.location.pickling. These changes were already part
    of the 3.5.3 release, which was erroneously numbered as a bugfix relese.
  
  - Removed dependency on zope.deferredimport, directly import deprecated modules
    without using it.
  

Changed:
  U   zope.location/trunk/CHANGES.txt
  U   zope.location/trunk/setup.py
  U   zope.location/trunk/src/zope/location/pickling.py

-=-
Modified: zope.location/trunk/CHANGES.txt
===================================================================
--- zope.location/trunk/CHANGES.txt	2009-08-27 18:05:05 UTC (rev 103310)
+++ zope.location/trunk/CHANGES.txt	2009-08-27 19:33:26 UTC (rev 103311)
@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+3.6.0 (2009-08-27)
+------------------
+
+- New feature release: deprecated locationCopy, CopyPersistent and
+  PathPersistent from zope.location.pickling. These changes were already part
+  of the 3.5.3 release, which was erroneously numbered as a bugfix relese.
+
+- Removed dependency on zope.deferredimport, directly import deprecated modules
+  without using it.
+
 3.5.5 (2009-08-15)
 ------------------
 

Modified: zope.location/trunk/setup.py
===================================================================
--- zope.location/trunk/setup.py	2009-08-27 18:05:05 UTC (rev 103310)
+++ zope.location/trunk/setup.py	2009-08-27 19:33:26 UTC (rev 103311)
@@ -21,7 +21,7 @@
     return text
 
 setup(name='zope.location',
-      version = '3.5.5dev',
+      version = '3.6.0',
       author='Zope Corporation and Contributors',
       author_email='zope-dev at zope.org',
       description='Zope Location',
@@ -36,7 +36,7 @@
           read('CHANGES.txt')
           ),
       license='ZPL 2.1',
-      keywords=('zope3 location strutural'),
+      keywords=('zope3 location structural'),
       classifiers = [
           'Development Status :: 5 - Production/Stable',
           'Environment :: Web Environment',
@@ -53,7 +53,6 @@
       namespace_packages=['zope',],
       install_requires=['setuptools',
                         'zope.interface',
-                        'zope.deferredimport',
                         'zope.schema>=3.5.1dev',
                         'zope.component',
                         'zope.proxy>3.3',

Modified: zope.location/trunk/src/zope/location/pickling.py
===================================================================
--- zope.location/trunk/src/zope/location/pickling.py	2009-08-27 18:05:05 UTC (rev 103310)
+++ zope.location/trunk/src/zope/location/pickling.py	2009-08-27 19:33:26 UTC (rev 103311)
@@ -19,13 +19,13 @@
 
 from zope.component import adapts
 from zope.copy.interfaces import ICopyHook, ResumeCopy
-from zope.deferredimport import deprecated
 from zope.interface import implements
 
-import zope.location.interfaces
+from zope.location.interfaces import ILocation, IRoot, ITraverser
 from zope.location.location import inside
 from zope.location.traversing import LocationPhysicallyLocatable
 
+
 class LocationCopyHook(object):
     """Copy hook to preserve copying referenced objects that are not
     located inside object that's being copied.
@@ -62,7 +62,7 @@
     
     """
     
-    adapts(zope.location.interfaces.ILocation)
+    adapts(ILocation)
     implements(ICopyHook)
     
     def __init__(self, context):
@@ -74,18 +74,17 @@
         raise ResumeCopy
         
 # BBB 2009/02/09
-deprecated(
-    'The locationCopy was replaced by more generic "clone" function'
-    'in the zope.copy package. This reference may be removed someday.',
-    locationCopy='zope.copy:clone'
-    )
-deprecated(
-    'The CopyPersistent was made more generic and moved to the'
-    'zope.copy package. This reference may be removed someday.',
-    CopyPersistent='zope.copy:CopyPersistent',
-)
+# The locationCopy was replaced by more generic "clone" function
+# in the zope.copy package. This reference may be removed someday.
+from zope.copy import clone as locationCopy
 
-# XXX: is this actually used anywhere? (nadako, 2009/02/09)
+# BBB 2009/02/09
+# The CopyPersistent was made more generic and moved to the
+# zope.copy package. This reference may be removed someday.
+from zope.copy import CopyPersistent
+
+# BBB 2009/08/22
+# This class is not used anywhere; this reference may be removed someday.
 class PathPersistent(object):
     """Persistence hooks for pickling locations
 
@@ -124,7 +123,7 @@
     >>> from zope.location.tests import TLocation
     >>> from zope.interface import directlyProvides
     >>> root = TLocation()
-    >>> directlyProvides(root, zope.location.interfaces.IRoot)
+    >>> directlyProvides(root, IRoot)
     >>> o3 = TLocation()
     >>> o3.__name__ = 'o3'
     >>> o3.__parent__ = root
@@ -162,7 +161,7 @@
         self.location = location
 
     def id(self, object):
-        if zope.location.interfaces.ILocation.providedBy(object):
+        if ILocation.providedBy(object):
             if not inside(object, self.location):
                 return LocationPhysicallyLocatable(object).getPath()
         return None
@@ -171,4 +170,4 @@
         if not path.startswith(u'/'):
             raise ValueError("Persistent paths must be absolute", path)
         root = LocationPhysicallyLocatable(self.location).getRoot()
-        return zope.location.interfaces.ITraverser(root).traverse(path[1:])
+        return ITraverser(root).traverse(path[1:])