[Checkins] SVN: zope.location/trunk/ Actually removed deprecated code from zope.location.pickling.

[Thomas Lotze]

Log message for revision 104210:
  Actually removed deprecated code from zope.location.pickling.

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

-=-
Modified: zope.location/trunk/CHANGES.txt
===================================================================
--- zope.location/trunk/CHANGES.txt	2009-09-17 13:30:01 UTC (rev 104209)
+++ zope.location/trunk/CHANGES.txt	2009-09-17 13:30:12 UTC (rev 104210)
@@ -8,6 +8,8 @@
 - Added getParent() to ILocationInfo and moved the actual implementation here
   from zope.traversal.api, analogous to getParents().
 
+- Actually removed deprecated code from zope.location.pickling.
+
 3.6.0 (2009-08-27)
 ------------------
 

Modified: zope.location/trunk/src/zope/location/pickling.py
===================================================================
--- zope.location/trunk/src/zope/location/pickling.py	2009-09-17 13:30:01 UTC (rev 104209)
+++ zope.location/trunk/src/zope/location/pickling.py	2009-09-17 13:30:12 UTC (rev 104210)
@@ -72,102 +72,3 @@
         if not inside(self.context, toplevel):
             return self.context
         raise ResumeCopy
-        
-# BBB 2009/02/09
-# 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
-
-# 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
-
-    See `locationCopy` above.
-
-    Unlike copy persistent, we use paths for ids of outside locations
-    so that we can separate pickling and unpickling in time.  We have
-    to compute paths and traverse objects to load paths, but paths can
-    be stored for later use, unlike the ids used by `CopyPersistent`.
-
-    We require outside locations that can be adapted to `ITraversable`.
-    To simplify the example, we'll use a simple traversable location
-    defined in `zope.location.tests`, `TLocation`.
-
-    Normally, general adapters are used to make objects traversable.
-
-    We get initialized with an initial location:
-
-    >>> from zope.location.location import Location
-    >>> o1 = Location()
-    >>> persistent = PathPersistent(o1)
-
-    We provide an id function that returns None when given a non-location:
-
-    >>> persistent.id(42)
-
-    Or when given a location that is inside the initial location:
-
-    >>> persistent.id(o1)
-    >>> o2 = Location(); o2.__parent__ = o1
-    >>> persistent.id(o2)
-
-    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.location.tests import TLocation
-    >>> from zope.interface import directlyProvides
-    >>> root = TLocation()
-    >>> directlyProvides(root, IRoot)
-    >>> o3 = TLocation()
-    >>> o3.__name__ = 'o3'
-    >>> o3.__parent__ = root
-    >>> root.o3 = o3
-    >>> persistent.id(o3)
-    u'/o3'
-
-    >>> o4 = TLocation()
-    >>> o4.__name__ = 'o4'
-    >>> o4.__parent__ = o3
-    >>> o3.o4 = o4
-    >>> persistent.id(o4)
-    u'/o3/o4'
-
-    We also provide a load method that returns objects by traversing
-    given paths.  It has to find the root based on the object given to
-    the constructor.  Therefore, that object must also be rooted:
-
-    >>> o1.__parent__ = root
-    >>> persistent.load(u'/o3') is o3
-    True
-    >>> persistent.load(u'/o3/o4') is o4
-    True
-
-    We must provide an absolute path for the load method:
-
-    >>> persistent.load(u'o3')
-    Traceback (most recent call last):
-    ...
-    ValueError: ('Persistent paths must be absolute', u'o3')
-
-    """
-
-    def __init__(self, location):
-        self.location = location
-
-    def id(self, object):
-        if ILocation.providedBy(object):
-            if not inside(object, self.location):
-                return LocationPhysicallyLocatable(object).getPath()
-        return None
-
-    def load(self, path):
-        if not path.startswith(u'/'):
-            raise ValueError("Persistent paths must be absolute", path)
-        root = LocationPhysicallyLocatable(self.location).getRoot()
-        return ITraverser(root).traverse(path[1:])