diff options
| author | Tres Seaver <tseaver@palladion.com> | 2012-06-07 15:10:21 +0000 |
|---|---|---|
| committer | Tres Seaver <tseaver@palladion.com> | 2012-06-07 15:10:21 +0000 |
| commit | 9f5fd4232f8cf6a8bef36402b114fd27226573b2 (patch) | |
| tree | 347924c3908384351991b3a1e4e07a7c00c295e4 | |
| parent | fdaa5c5681ad45af217fa2dbc5243f4bcb6f7bec (diff) | |
| download | zope-location-9f5fd4232f8cf6a8bef36402b114fd27226573b2.tar.gz | |
Removed backward-compatibility imports:
- 'zope.copy.clone' (aliased as 'zope.location.pickling.locationCopy')
- 'zope.copy.CopyPersistent' (aliased as
'zope.location.pickling.CopyPersistent').
- 'zope.site.interfaces.IPossibleSite' (aliased as
'zope.location.interfaces.IPossibleSite').
| -rw-r--r-- | CHANGES.txt | 10 | ||||
| -rw-r--r-- | src/zope/location/interfaces.py | 3 | ||||
| -rw-r--r-- | src/zope/location/pickling.py | 10 |
3 files changed, 10 insertions, 13 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 3da4163..947a247 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,16 @@ CHANGES 4.0.0 (unreleased) ------------------ +- Removed backward-compatibility imports: + + - ``zope.copy.clone`` (aliased as ``zope.location.pickling.locationCopy``) + + - ``zope.copy.CopyPersistent`` (aliased as + ``zope.location.pickling.CopyPersistent``). + + - ``zope.site.interfaces.IPossibleSite`` (aliased as + ``zope.location.interfaces.IPossibleSite``). + - Added Python 3.2 support. - Made ``zope.component`` dependency optional. Use the ``component`` extra diff --git a/src/zope/location/interfaces.py b/src/zope/location/interfaces.py index 661ba72..8977187 100644 --- a/src/zope/location/interfaces.py +++ b/src/zope/location/interfaces.py @@ -128,9 +128,6 @@ class LocationError(KeyError, LookupError): # backwardc-comppatibiltiy try: from zope.component.interfaces import ISite - from zope.component.interfaces import IPossibleSite # BBB except ImportError: #pragma NO COVER class ISite(Interface): pass - class IPossibleSite(Interface): # BBB - pass diff --git a/src/zope/location/pickling.py b/src/zope/location/pickling.py index ad7b92d..17343f4 100644 --- a/src/zope/location/pickling.py +++ b/src/zope/location/pickling.py @@ -37,13 +37,3 @@ class LocationCopyHook(object): if not inside(self.context, toplevel): return self.context raise ResumeCopy - -# BBB 2009-09-02 -# 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-09-02 -# The CopyPersistent was made more generic and moved to the -# zope.copy package. This reference may be removed someday. -from zope.copy import CopyPersistent |