[Checkins] SVN: zope.app.testing/trunk/ Removed deprecated back35 module and loose the dependency on ``zope.deferredimport``.

[Hanno Schlichting]

Log message for revision 99512:
  Removed deprecated back35 module and loose the dependency on ``zope.deferredimport``.
  

Changed:
  U   zope.app.testing/trunk/CHANGES.txt
  U   zope.app.testing/trunk/setup.py
  D   zope.app.testing/trunk/src/zope/app/testing/back35.py
  U   zope.app.testing/trunk/src/zope/app/testing/setup.py

-=-
Modified: zope.app.testing/trunk/CHANGES.txt
===================================================================
--- zope.app.testing/trunk/CHANGES.txt	2009-04-26 13:19:14 UTC (rev 99511)
+++ zope.app.testing/trunk/CHANGES.txt	2009-04-26 13:25:13 UTC (rev 99512)
@@ -5,6 +5,9 @@
 3.6.2 (unreleased)
 ------------------
 
+- Removed deprecated back35 module and loose the dependency on
+  ``zope.deferredimport``.
+
 - Adapt to ``zope.app.authentication`` refactoring. We depend on
   ``zope.password`` now instead.
 

Modified: zope.app.testing/trunk/setup.py
===================================================================
--- zope.app.testing/trunk/setup.py	2009-04-26 13:19:14 UTC (rev 99511)
+++ zope.app.testing/trunk/setup.py	2009-04-26 13:25:13 UTC (rev 99512)
@@ -70,7 +70,6 @@
                         'zope.app.publication',
                         'zope.component',
                         'zope.container',
-                        'zope.deferredimport',
                         'zope.i18n',
                         'zope.interface',
                         'zope.location',

Deleted: zope.app.testing/trunk/src/zope/app/testing/back35.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/back35.py	2009-04-26 13:19:14 UTC (rev 99511)
+++ zope.app.testing/trunk/src/zope/app/testing/back35.py	2009-04-26 13:25:13 UTC (rev 99512)
@@ -1,34 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 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.
-#
-##############################################################################
-"""Features that will be deprecated in Zope 3.5
-
-$Id$
-"""
-
-from zope.traversing.api import traverse
-from zope.component.service import IService
-from zope.app.component.site import UtilityRegistration
-from zope.app.component.back35 import ActiveStatus
-
-def addService(servicemanager, name, service, suffix=''):
-    """Add a service to a service manager
-
-    This utility is useful for tests that need to set up services.
-    """
-    default = traverse(servicemanager, 'default')
-    default[name+suffix] = service
-    registration = UtilityRegistration(name, IService, service, default)
-    key = default.registrationManager.addRegistration(registration)
-    traverse(default.registrationManager, key).status = ActiveStatus
-    return default[name+suffix]

Modified: zope.app.testing/trunk/src/zope/app/testing/setup.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/setup.py	2009-04-26 13:19:14 UTC (rev 99511)
+++ zope.app.testing/trunk/src/zope/app/testing/setup.py	2009-04-26 13:25:13 UTC (rev 99512)
@@ -18,13 +18,6 @@
 import zope.component
 import zope.traversing.api
 
-import zope.deferredimport
-zope.deferredimport.deprecatedFrom(
-    "Goes away in Zope 3.5",
-    "zope.app.testing.back35",
-    "addService",
-    )
-
 #------------------------------------------------------------------------
 # Annotations
 from zope.annotation.attribute import AttributeAnnotations