[Zope3-checkins] SVN: Zope3/trunk/ Remove some deprecated aliases.
Florent Xicluna
laxyf at yahoo.fr
Sun Sep 17 10:45:08 EDT 2006
Log message for revision 70211:
Remove some deprecated aliases.
Remove some deprecated methods.
Changed:
U Zope3/trunk/doc/CHANGES.txt
U Zope3/trunk/src/zope/app/error/interfaces.py
U Zope3/trunk/src/zope/app/file/interfaces.py
U Zope3/trunk/src/zope/app/form/__init__.py
U Zope3/trunk/src/zope/app/form/tests/test_widget.py
U Zope3/trunk/src/zope/app/intid/__init__.py
U Zope3/trunk/src/zope/app/principalannotation/__init__.py
U Zope3/trunk/src/zope/app/security/interfaces.py
U Zope3/trunk/src/zope/app/server/configure.zcml
U Zope3/trunk/src/zope/app/session/interfaces.py
U Zope3/trunk/src/zope/app/workflow/tests/workflowsetup.py
U Zope3/trunk/src/zope/copypastemove/__init__.py
U Zope3/trunk/src/zope/interface/interface.py
U Zope3/trunk/src/zope/security/checker.py
U Zope3/trunk/src/zope/security/interfaces.py
U Zope3/trunk/src/zope/server/http/publisherhttpserver.py
-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/doc/CHANGES.txt 2006-09-17 14:45:07 UTC (rev 70211)
@@ -37,6 +37,38 @@
Restructuring
+ - Removed deprecated aliases:
+
+ * ``UniqueIdUtility`` for ``IntIds``
+
+ * ``ReferenceToPersistent`` for ``KeyReferenceToPersistent``
+
+ * ``zope.app.uniqueid`` for ``zope.app.intid``
+
+ * ``HTTP`` for ``WSGI-HTTP``
+
+ * ``PostmortemDebuggingHTTP`` for ``WSGI-PostmortemDebuggingHTTP``
+
+ * ``PublisherHTTPServer`` for ``PMDBHTTPServer``
+
+ * ``IBrowserIdManager`` for ``IClientIdManager``
+
+ - Removed deprecated ``zope.app.file.interfaces.IFileContent``.
+ Use ``zope.app.publication.interfaces.IFileContent``
+
+ - Removed deprecated ``zope.app.form.CustomSequenceWidgetFactory``.
+ Use ``zope.app.form.CustomWidgetFactory``.
+
+ - Removed deprecated services:
+ ``IErrorReportingService``, ``ILocalErrorReportingService``,
+ ``IPrincipalAnnotationService``, ``IAuthenticationService``.
+ They are replaced by Utilities.
+
+ - Removed deprecated methods:
+ ``zope.copypastemove.ObjectCopier._configureCopy``,
+ ``zope.interface.interface.Specification.isImplementedByInstancesOf``,
+ ``zope.interface.interface.Specification.isImplementedBy``,
+
- Removed deprecated ``zope.app.pluggableauth`` package.
See ``zope.app.authentication``.
Modified: Zope3/trunk/src/zope/app/error/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/error/interfaces.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/app/error/interfaces.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -50,11 +50,3 @@
def getLogEntryById(id):
"""Return LogEntry by ID"""
-
-###############################################################################
-# BBB: 12/14/2004
-
-IErrorReportingService = IErrorReportingUtility
-ILocalErrorReportingService = ILocalErrorReportingUtility
-
-###############################################################################
Modified: Zope3/trunk/src/zope/app/file/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/file/interfaces.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/app/file/interfaces.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -22,14 +22,6 @@
from zope.app.i18n import ZopeMessageFactory as _
-# BBB: To go away in 3.3
-from zope.app.publication.interfaces import IFileContent
-from zope.deprecation import deprecated
-deprecated('IFileContent',
- '`IFileContent` has moved `zope.app.publication.interfaces`. '
- 'This will go away in 3.3.')
-
-
class IFile(Interface):
contentType = BytesLine(
Modified: Zope3/trunk/src/zope/app/form/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/form/__init__.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/app/form/__init__.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -24,10 +24,6 @@
from zope.i18n import translate
from zope.schema.interfaces import IChoice, ICollection
-deprecated('CustomSequenceWidgetFactory',
- 'Use CustomWidgetFactory instead. '
- 'The reference will be gone in Zope 3.4.')
-
class Widget(object):
"""Mixin class providing functionality common across widget types."""
@@ -118,14 +114,3 @@
args = (context, request) + self.args
return self._create(args)
-
-
-# BBB: Gone in 3.4 (does not satify IViewFactory)
-class CustomSequenceWidgetFactory(CustomWidgetFactory):
- """Custom sequence widget factory."""
-
- def __call__(self, context, field, request):
- if not ICollection.providedBy(context):
- raise TypeError, "Provided field does not provide ICollection."
-
- return super(CustomSequenceWidgetFactory, self).__call__(context, request)
Modified: Zope3/trunk/src/zope/app/form/tests/test_widget.py
===================================================================
--- Zope3/trunk/src/zope/app/form/tests/test_widget.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/app/form/tests/test_widget.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -202,39 +202,6 @@
"""
-# BBB: Gone in 3.3 (does not satify IViewFactory)
-class TestCustomSequenceWidgetFactory(object):
- """Tests the custom sequence widget factory.
-
- Custom widgets can be created using a custom widget factory. Factories
- are used to assign attribute values to widgets they create. The custom
- sequence widget factory can be used for a list or tuple of objects:
-
- >>> from zope.schema import TextLine, List
- >>> from zope.app.form.browser import ListSequenceWidget
-
-
- >>> value_type = TextLine(__name__=u'bar')
- >>> field = List( __name__=u'foo', value_type=value_type )
-
- >>> ow = CustomWidgetFactory(FooWidget, bar='baz')
-
- >>> import zope.deprecation
- >>> zope.deprecation.__show__.off()
- >>> from zope.app.form import CustomSequenceWidgetFactory
- >>> zope.deprecation.__show__.on()
- >>> sw = CustomSequenceWidgetFactory(ListSequenceWidget, subwidget=ow)
- >>> widget = sw(field, TextLine(), request)
- >>> isinstance(widget, ListSequenceWidget)
- True
- >>> isinstance(widget.subwidget, CustomWidgetFactory)
- True
- >>> widget.subwidget is ow
- True
- >>> widget.context.value_type is value_type
- True
- """
-
def test_suite():
return TestSuite((
DocTestSuite(setUp=setUp, tearDown=tearDown),
Modified: Zope3/trunk/src/zope/app/intid/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/intid/__init__.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/app/intid/__init__.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -167,12 +167,3 @@
utility.register(key)
# Notify the catalogs that this object was added.
notify(IntIdAddedEvent(ob, event))
-
-# BBB
-UniqueIdUtility = IntIds
-import zope.app.keyreference.persistent
-ReferenceToPersistent = (
- zope.app.keyreference.persistent.KeyReferenceToPersistent)
-import sys
-sys.modules['zope.app.uniqueid'] = sys.modules['zope.app.intid']
-del sys
Modified: Zope3/trunk/src/zope/app/principalannotation/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/principalannotation/__init__.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/app/principalannotation/__init__.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -140,8 +140,3 @@
return utility.getAnnotations(principal)
component.adapter(zope.security.interfaces.IPrincipal)(annotations)
interface.implementer(IAnnotations)(annotations)
-
-#############################################################################
-# BBB: 12/20/2004
-PrincipalAnnotationService = PrincipalAnnotationUtility
-#############################################################################
Modified: Zope3/trunk/src/zope/app/security/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/security/interfaces.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/app/security/interfaces.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -136,11 +136,6 @@
"""This interface is deprecated
"""
-############################################################################
-# BBB: 12/15/2004
-IAuthenticationService = IAuthenticationUtility
-############################################################################
-
class ILoginPassword(Interface):
"""A password based login.
Modified: Zope3/trunk/src/zope/app/server/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/server/configure.zcml 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/app/server/configure.zcml 2006-09-17 14:45:07 UTC (rev 70211)
@@ -25,18 +25,4 @@
provides=".servertype.IServerType"
/>
- <!-- BBB: An alias kept around until Zope 3.4 -->
- <utility
- name="HTTP"
- component=".wsgi.http"
- provides=".servertype.IServerType"
- />
-
- <!-- BBB: An alias kept around until Zope 3.4 -->
- <utility
- name="PostmortemDebuggingHTTP"
- component=".wsgi.pmhttp"
- provides=".servertype.IServerType"
- />
-
</configure>
Modified: Zope3/trunk/src/zope/app/session/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/session/interfaces.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/app/session/interfaces.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -149,7 +149,3 @@
be persistent or picklable.
"""
-
-# BBB, generation 0, 2004-07-12
-
-IBrowserIdManager = IClientIdManager
Modified: Zope3/trunk/src/zope/app/workflow/tests/workflowsetup.py
===================================================================
--- Zope3/trunk/src/zope/app/workflow/tests/workflowsetup.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/app/workflow/tests/workflowsetup.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -18,7 +18,6 @@
from zope.interface import implements
from zope.app import zapi
-from zope.app.security.interfaces import IAuthenticationService
from zope.app.security.principalregistry import principalRegistry
from zope.app.component.testing import PlacefulSetup
from zope.app.testing import setup
Modified: Zope3/trunk/src/zope/copypastemove/__init__.py
===================================================================
--- Zope3/trunk/src/zope/copypastemove/__init__.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/copypastemove/__init__.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -40,8 +40,6 @@
from zope.app.container.interfaces import INameChooser
from zope.app.container.constraints import checkObject
-import warnings # BBB (remove in 3.3)
-
class ItemNotFoundError(LookupError):
implements(IItemNotFoundError)
@@ -405,23 +403,6 @@
target[new_name] = copy
return new_name
- def _configureCopy(self, copy, target, new_name):
- """Configures the copied object before it is added to `target`.
-
- `target` and `new_name` are provided as additional information.
-
- By default, `copy.__parent__` and `copy.__name__` are set to ``None``.
-
- Subclasses may override this method to perform additional
- configuration of the copied object.
- """
- # BBB (remove in 3.3)
- warnings.warn(
- "_configureCopy is deprecated -- to configure a recently copied"
- "object, register a handler for IObjectCopiedEvent",
- DeprecationWarning)
- copy.__parent__ = copy.__name__ = None
-
def copyable(self):
"""Returns True if the object is copyable, otherwise False."""
return True
Modified: Zope3/trunk/src/zope/interface/interface.py
===================================================================
--- Zope3/trunk/src/zope/interface/interface.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/interface/interface.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -255,26 +255,6 @@
isOrExtends = SpecificationBase.isOrExtends
providedBy = SpecificationBase.providedBy
- #########################################################################
- # BBB 2004-07-13: Backward compatabilty. These methods have been
- # deprecated in favour of providedBy and implementedBy.
-
- def isImplementedByInstancesOf(self, cls):
- warnings.warn(
- "isImplementedByInstancesOf has been renamed to implementedBy",
- DeprecationWarning, stacklevel=2,
- )
- return self.implementedBy(cls)
-
- def isImplementedBy(self, ob):
- warnings.warn(
- "isImplementedBy has been renamed to providedBy",
- DeprecationWarning, stacklevel=2,
- )
- return self.providedBy(ob)
- #
- #########################################################################
-
def __init__(self, bases=()):
self._implied = {}
self.dependents = weakref.WeakKeyDictionary()
Modified: Zope3/trunk/src/zope/security/checker.py
===================================================================
--- Zope3/trunk/src/zope/security/checker.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/security/checker.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -709,10 +709,6 @@
type(Interface): InterfaceChecker(
IInterface,
__str__=CheckerPublic, _implied=CheckerPublic, subscribe=CheckerPublic,
- # BBB 2004-07-13: backward compatability for deprecated
- # interface methods
- isImplementedByInstancesOf=CheckerPublic,
- isImplementedBy=CheckerPublic,
),
zope.interface.interface.Method: InterfaceChecker(
zope.interface.interfaces.IMethod),
Modified: Zope3/trunk/src/zope/security/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/security/interfaces.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/security/interfaces.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -319,12 +319,3 @@
title=_("Description"),
description=_("Provides a description for the permission."),
required=False)
-
-
-
-
-
-
-
-
-
Modified: Zope3/trunk/src/zope/server/http/publisherhttpserver.py
===================================================================
--- Zope3/trunk/src/zope/server/http/publisherhttpserver.py 2006-09-17 14:07:15 UTC (rev 70210)
+++ Zope3/trunk/src/zope/server/http/publisherhttpserver.py 2006-09-17 14:45:07 UTC (rev 70211)
@@ -61,11 +61,3 @@
return super(PublisherHTTPServer, self).__init__(
application, sub_protocol, *args, **kw)
-
-
-# BBB: Backward-compatibility.
-zope.deprecation.deprecated(
- ('PublisherHTTPServer', 'PMDBHTTPServer'),
- 'This plain publisher support has been replaced in favor of the '
- 'WSGI HTTP server '
- 'The reference will be gone in Zope 3.4.')
More information about the Zope3-Checkins
mailing list