[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/site/
Removed deprecated code. Truly deprecated placefulsetup.
Jim Fulton
jim at zope.com
Tue Apr 18 19:55:23 EDT 2006
Log message for revision 67085:
Removed deprecated code. Truly deprecated placefulsetup.
Changed:
D Zope3/branches/jim-adapter/src/zope/app/site/folder.py
D Zope3/branches/jim-adapter/src/zope/app/site/interfaces.py
D Zope3/branches/jim-adapter/src/zope/app/site/service.py
D Zope3/branches/jim-adapter/src/zope/app/site/servicecontainer.py
U Zope3/branches/jim-adapter/src/zope/app/site/tests/__init__.py
D Zope3/branches/jim-adapter/src/zope/app/site/tests/placefulsetup.py
-=-
Deleted: Zope3/branches/jim-adapter/src/zope/app/site/folder.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/site/folder.py 2006-04-18 23:55:20 UTC (rev 67084)
+++ Zope3/branches/jim-adapter/src/zope/app/site/folder.py 2006-04-18 23:55:22 UTC (rev 67085)
@@ -1,34 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""A site management folder contains components and component registrations.
-
-$Id: folder.py 25177 2004-06-02 13:17:31Z jim $
-"""
-from zope.deprecation import deprecated
-from zope.app.container.btree import BTreeContainer
-
-from zope.app.component.site import SiteManagementFolder
-from zope.app.component.site import SMFolderFactory
-
-deprecated(('SiteManagementFolder', 'SMFolderFactory'),
- 'This class has moved to zope.app.component.site. '
- 'The reference will be gone in Zope 3.3.')
-
-# I really hope that noone is using this.
-class SiteManagementFolders(BTreeContainer):
- pass
-
-deprecated('SiteManagementFolders',
- 'This class has been deprecated. It was not used anyways. '
- 'The reference will be gone in Zope 3.3.')
Deleted: Zope3/branches/jim-adapter/src/zope/app/site/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/site/interfaces.py 2006-04-18 23:55:20 UTC (rev 67084)
+++ Zope3/branches/jim-adapter/src/zope/app/site/interfaces.py 2006-04-18 23:55:22 UTC (rev 67085)
@@ -1,126 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Interfaces for folders.
-
-$Id: interfaces.py 27514 2004-09-13 15:54:05Z fdrake $
-"""
-import zope.schema
-from zope.deprecation import deprecated
-from zope.interface import Interface
-
-from zope.app.component.interfaces import registration
-from zope.app.container.interfaces import IContainer
-from zope.app.component.interfaces import IPossibleSite, ISite
-from zope.app.component.interfaces import ILocalSiteManager
-from zope.app.component.interfaces import ISiteManagementFolder
-
-deprecated(('IPossibleSite', 'ISite'),
- 'This interface has been moved to zope.app.component.interfaces. '
- 'The reference will be gone in Zope 3.3.')
-
-
-class ILocalService(registration.IRegisterable):
- """A local service isn't a local service if it doesn't implement this.
-
- The contract of a local service includes collaboration with
- services above it. A local service should also implement
- IRegisterable (which implies that it is adaptable to
- IRegistered). Implementing ILocalService implies this.
- """
-
-class ISimpleService(ILocalService):
- """Most local services should implement this instead of ILocalService.
-
- It implies a specific way of implementing IRegisterable,
- by subclassing IAttributeRegisterable.
- """
-
-deprecated(('ILocalService', 'ISimpleService'),
- 'The concept of services has been removed. Use utilities instead. '
- 'The reference will be gone in Zope 3.3.')
-
-class IComponentManager(Interface):
-
- def queryComponent(type=None, filter=None, all=0):
- """Return all components that match the given type and filter
-
- The objects are returned a sequence of mapping objects with keys:
-
- path -- The component path
-
- component -- The component
-
- all -- A flag indicating whether all component managers in
- this place should be queried, or just the local one.
-
- """
-
-deprecated('IComponentManager',
- 'This interface has been removed. It was horrible anyways. '
- 'The reference will be gone in Zope 3.3.')
-
-class IBindingAware(Interface):
-
- def bound(name):
- """Inform a service component that it is providing a service
-
- Called when an immediately-containing service manager binds
- this object to perform the named service.
- """
-
- def unbound(name):
- """Inform a service component that it is no longer providing a service
-
- Called when an immediately-containing service manager unbinds
- this object from performing the named service.
- """
-
-deprecated('IBindingAware',
- 'Now that services are gone, we do not need the binding support. '
- 'The reference will be gone in Zope 3.3.')
-
-class IServiceRegistration(registration.IComponentRegistration):
- """Service Registration
-
- Service registrations are dependent on the components that they
- configure. They register themselves as component dependents.
-
- The name of a service registration is used to determine the service
- type.
- """
-
- name = zope.schema.TextLine(
- title=u"Name",
- description=u"The name that is registered",
- readonly=True,
- # Don't allow empty or missing name:
- required=True,
- min_length=1,
- )
-
-deprecated('IServiceRegistration',
- 'The concept of services has been removed. Use utilities instead. '
- 'The reference will be gone in Zope 3.3.')
-
-class ISiteManagementFolders(IContainer, IComponentManager):
- """A collection of ISiteManagementFolder objects.
-
- An ISiteManagementFolders object supports simple containment as
- well as package query and lookup.
-
- """
-
-deprecated('ISiteManagementFolders',
- 'This interface has been removed. It was unused. '
- 'The reference will be gone in Zope 3.3.')
Deleted: Zope3/branches/jim-adapter/src/zope/app/site/service.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/site/service.py 2006-04-18 23:55:20 UTC (rev 67084)
+++ Zope3/branches/jim-adapter/src/zope/app/site/service.py 2006-04-18 23:55:22 UTC (rev 67085)
@@ -1,54 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Service Manager code
-
-$Id: service.py 29078 2005-02-07 22:50:03Z garrett $
-"""
-__docformat__ = "reStructuredText"
-import zope.interface
-import zope.deprecation
-
-from zope.app.component.site import LocalSiteManager, UtilityRegistration
-from zope.app.component.interfaces.registration import \
- IRegisterableContainerContaining as IRegisterableContainerContainer
-
-zope.deprecation.__show__.off()
-from zope.component.bbb.service import IService
-from interfaces import IServiceRegistration
-zope.deprecation.__show__.on()
-
-zope.deprecation.deprecated(
- ('SiteManager', 'UtilityRegistration'),
- 'This class has been moved to zope.app.component.site. '
- 'The reference will be gone in Zope 3.3.')
-
-zope.deprecation.deprecated(
- 'IRegisterableContainerContainer',
- 'This interface has been moved to zope.app.component.interfaces '
- 'and been renamed to IRegisterableContainerContaining. '
- 'The reference will be gone in Zope 3.3.')
-
-ServiceManager = LocalSiteManager
-SiteManager = LocalSiteManager
-
-class ServiceRegistration(UtilityRegistration):
- zope.interface.implements(IServiceRegistration)
-
- def __init__(self, name, path, context=None):
- super(ServiceRegistration, self).__init__(name, IService, path)
-
-zope.deprecation.deprecated(
- ('ServiceManager', 'ServiceRegistration'),
- 'The concept of services has been removed. Use utilities instead. '
- 'The reference will be gone in Zope 3.3.')
Deleted: Zope3/branches/jim-adapter/src/zope/app/site/servicecontainer.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/site/servicecontainer.py 2006-04-18 23:55:20 UTC (rev 67084)
+++ Zope3/branches/jim-adapter/src/zope/app/site/servicecontainer.py 2006-04-18 23:55:22 UTC (rev 67085)
@@ -1,28 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Service Manager Container
-
-$Id: servicecontainer.py 25177 2004-06-02 13:17:31Z jim $
-"""
-__docformat__ = "reStructuredText"
-from zope.deprecation import deprecated
-
-from zope.app.component.site import SiteManagerContainer
-
-ServiceManagerContainer = SiteManagerContainer
-
-deprecated('ServiceManagerContainer',
- 'This class has been moved to zope.app.component.site '
- 'and been renamed to SiteManagerContainer. '
- 'The reference will be gone in Zope 3.3.')
Modified: Zope3/branches/jim-adapter/src/zope/app/site/tests/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/site/tests/__init__.py 2006-04-18 23:55:20 UTC (rev 67084)
+++ Zope3/branches/jim-adapter/src/zope/app/site/tests/__init__.py 2006-04-18 23:55:22 UTC (rev 67085)
@@ -1,6 +1,15 @@
-# BBB: Goes away in 3.3
+import zope.deferredimport
-from zope.app.component.testing import PlacefulSetup
+zope.deferredimport.deprecatedModule(
+ "zope.app.site.tests.placefulsetup",
+ "zope.app.component.testing",
+ "zope.app.site.tests.placefulsetup is deprecated and will go away "
+ "in Zope 3.5. Use zope.app.component.testing instead"
+ )
-def test_suite():
- return None
+zope.deferredimport.deprecated(
+ "Import of PlacefulSetup from zope.app.site.testing is deprecated "
+ "and will be disabled in Zope 3.5. Import from "
+ "zope.app.component.testing instead.",
+ PlacefulSetup = "zope.app.component.testing:PlacefulSetup",
+ )
Deleted: Zope3/branches/jim-adapter/src/zope/app/site/tests/placefulsetup.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/site/tests/placefulsetup.py 2006-04-18 23:55:20 UTC (rev 67084)
+++ Zope3/branches/jim-adapter/src/zope/app/site/tests/placefulsetup.py 2006-04-18 23:55:22 UTC (rev 67085)
@@ -1 +0,0 @@
-from zope.app.component.testing import *
More information about the Zope3-Checkins
mailing list