[Checkins] SVN: zope.app.zapi/trunk/ - Removed BBB imports of deprecated parts (services, multiviews etc.) which were removed in ``zope.component`` 3.6, thus requiring at least this version.

[Michael Howitz]

Log message for revision 120643:
  - Removed BBB imports of deprecated parts (services, multiviews etc.) which were removed in ``zope.component`` 3.6, thus requiring at least this version.
  

Changed:
  U   zope.app.zapi/trunk/CHANGES.txt
  U   zope.app.zapi/trunk/setup.py
  U   zope.app.zapi/trunk/src/zope/app/zapi/__init__.py

-=-
Modified: zope.app.zapi/trunk/CHANGES.txt
===================================================================
--- zope.app.zapi/trunk/CHANGES.txt	2011-03-01 11:55:58 UTC (rev 120642)
+++ zope.app.zapi/trunk/CHANGES.txt	2011-03-01 12:01:08 UTC (rev 120643)
@@ -4,6 +4,10 @@
 3.4.2 (unreleased)
 ------------------
 
+- Removed BBB imports of deprecated parts (services, multiviews etc.) which
+  were removed in ``zope.component`` 3.6, thus requiring at least this
+  version.
+
 - Using Python's ``doctest`` module instead of depreacted
   ``zope.testing.doctest``.
 

Modified: zope.app.zapi/trunk/setup.py
===================================================================
--- zope.app.zapi/trunk/setup.py	2011-03-01 11:55:58 UTC (rev 120642)
+++ zope.app.zapi/trunk/setup.py	2011-03-01 12:01:08 UTC (rev 120643)
@@ -11,11 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Setup for zope.app.zapi package
+"""Setup for zope.app.zapi package"""
 
-$Id$
-"""
-
 import os
 
 from setuptools import setup, find_packages, Extension
@@ -39,7 +36,7 @@
     version='3.4.2dev',
     url='http://pypi.python.org/pypi/zope.app.zapi',
     author='Zope Corporation and Contributors',
-    author_email='zope3-dev at zope.org',
+    author_email='zope-dev at zope.org',
     license='ZPL 2.1',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -62,8 +59,7 @@
         'setuptools',
         'zope.app.interface',
         'zope.app.publisher',
-        'zope.component',
-        'zope.deferredimport',
+        'zope.component >= 3.6',
         'zope.deprecation',
         'zope.interface',
         'zope.traversing',

Modified: zope.app.zapi/trunk/src/zope/app/zapi/__init__.py
===================================================================
--- zope.app.zapi/trunk/src/zope/app/zapi/__init__.py	2011-03-01 11:55:58 UTC (rev 120642)
+++ zope.app.zapi/trunk/src/zope/app/zapi/__init__.py	2011-03-01 12:01:08 UTC (rev 120643)
@@ -36,22 +36,3 @@
 def principals():
     from zope.authentication.interfaces import IAuthentication
     return getUtility(IAuthentication)
-
-# BBB 2006/04/27 -- to be removed after 12 months
-import zope.deferredimport
-zope.deferredimport.deprecated(
-    "This object was deprecated long ago.  Only import is allowed now "
-    "and will be disallowed in Zope 3.5.",
-    getGlobalServices = "zope.component.back35:deprecated",
-    getGlobalService = "zope.component.back35:deprecated",
-    getService = "zope.component.back35:deprecated",
-    getServiceDefinitions = "zope.component.back35:deprecated",
-    getView = "zope.component.back35:deprecated",
-    queryView = "zope.component.back35:deprecated",
-    getMultiView = "zope.component.back35:deprecated",
-    queryMultiView = "zope.component.back35:deprecated",
-    getViewProviding = "zope.component.back35:deprecated",
-    queryViewProviding = "zope.component.back35:deprecated",
-    getResource = "zope.component.back35:deprecated",
-    queryResource = "zope.component.back35:deprecated",
-    )