[Zope3-checkins] SVN: Zope3/branches/srichter-blow-services/src/zope/app/ Remove bbb package, since I am taking a different approach to

[Stephan Richter]

Log message for revision 28837:
  Remove bbb package, since I am taking a different approach to 
  backward-compatibility now.
  

Changed:
  U   Zope3/branches/srichter-blow-services/src/zope/app/component/__init__.py
  D   Zope3/branches/srichter-blow-services/src/zope/app/component/bbb/
  U   Zope3/branches/srichter-blow-services/src/zope/app/tests/__init__.py

-=-
Modified: Zope3/branches/srichter-blow-services/src/zope/app/component/__init__.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/component/__init__.py	2005-01-14 21:43:48 UTC (rev 28836)
+++ Zope3/branches/srichter-blow-services/src/zope/app/component/__init__.py	2005-01-14 21:55:23 UTC (rev 28837)
@@ -19,28 +19,6 @@
 import zope.component
 from zope.app import zapi
 
-##############################################################################
-# BBB: Backward Compatiblity 12/23/2004
-
-#import sys
-import zope.app
-#from zope.app.component.bbb import registration as bbb_registration
-#sys.modules['zope.app.registration'] = bbb_registration
-#zope.app.registration = bbb_registration
-#from zope.app.component.bbb import localservice
-#sys.modules['zope.app.component.localservice'] = localservice
-#from zope.app.component.bbb import site
-#sys.modules['zope.app.site'] = site
-#zope.app.site = site
-#from zope.app.component.bbb import adapter as bbb_adapter
-#sys.modules['zope.app.adapter'] = bbb_adapter
-#zope.app.adapter = bbb_adapter
-#from zope.app.component.bbb import utility
-#sys.modules['zope.app.utility'] = utility
-#zope.app.utility = utility
-
-##############################################################################
-
 _marker = object()
 
 def getNextSiteManager(context):

Modified: Zope3/branches/srichter-blow-services/src/zope/app/tests/__init__.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/tests/__init__.py	2005-01-14 21:43:48 UTC (rev 28836)
+++ Zope3/branches/srichter-blow-services/src/zope/app/tests/__init__.py	2005-01-14 21:55:23 UTC (rev 28837)
@@ -3,17 +3,27 @@
 
 ##############################################################################
 # BBB: backward-comptibility; 12/18/2004
+
 import sys
-#from zope.app.testing import placelesssetup
-#sys.modules['zope.app.tests.placelesssetup'] = placelesssetup
-#from zope.app.testing import setup
-#sys.modules['zope.app.tests.setup'] = setup
-#from zope.app.testing import dochttp
-#sys.modules['zope.app.tests.dochttp'] = dochttp
-#from zope.app.testing import functional
-#sys.modules['zope.app.tests.functional'] = functional
-#from zope.app.testing import test
-#sys.modules['zope.app.tests.test'] = test
-#from zope.app.testing import ztapi
-#sys.modules['zope.app.tests.ztapi'] = ztapi
+from zope.deprecation.deprecation import DeprecatedModule 
+import zope.app
+
+def deprecate(module):
+    return DeprecatedModule(module,
+                            'Test setup code moved from zope.app.tests to '
+                            'zope.app.testing. This will go away in Zope 3.3.')
+
+
+from zope.app.testing import placelesssetup
+sys.modules['zope.app.tests.placelesssetup'] = deprecate(placelesssetup)
+from zope.app.testing import setup
+sys.modules['zope.app.tests.setup'] = deprecate(setup)
+from zope.app.testing import dochttp
+sys.modules['zope.app.tests.dochttp'] = deprecate(dochttp)
+from zope.app.testing import functional
+sys.modules['zope.app.tests.functional'] = deprecate(functional)
+from zope.app.testing import test
+sys.modules['zope.app.tests.test'] = deprecate(test)
+from zope.app.testing import ztapi
+sys.modules['zope.app.tests.ztapi'] = deprecate(ztapi)
 #############################################################################