[Checkins] SVN: zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/xmlconfig.py Remove ancient zope.app.zcmlfiles / site.zcml BBB hack.

[Tres Seaver]

Log message for revision 125708:
  Remove ancient zope.app.zcmlfiles / site.zcml BBB hack.

Changed:
  U   zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/xmlconfig.py

-=-
Modified: zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/xmlconfig.py
===================================================================
--- zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/xmlconfig.py	2012-05-08 01:17:47 UTC (rev 125707)
+++ zope.configuration/branches/tseaver-test_cleanup/src/zope/configuration/xmlconfig.py	2012-05-08 01:17:53 UTC (rev 125708)
@@ -367,29 +367,6 @@
     elif not file:
         file = 'configure.zcml'
 
-    # BBB 2006/12/19 -- to be removed after 12 months
-    # This is a backward-compatibility support for old site.conf
-
-    if package and (package.__name__ == 'zope.app'):
-        try:
-            import zope.app.zcmlfiles
-        except ImportError:
-            pass # maybe this is an old zope without zope.app.zcmlfiles
-        else:
-            dirpath, filename = os.path.split(file)
-            # be careful, because zope.app is a namespace package
-            # we can't assume that zcmlfiles is a subdirectory of the 
-            # zope.app package
-            dirpath = os.path.dirname(zope.app.zcmlfiles.__file__)
-            file = os.path.join(dirpath, filename)
-            import warnings
-            warnings.warn('In configuration file: %s '
-                          'replace: <include package="zope.app" /> '
-                          'with: <include package="zope.app.zcmlfiles" /> '
-                          'This will go away in Zope 3.6.' % os.path.abspath(file),
-                          DeprecationWarning,
-                          2)
-
     # This is a tad tricky. We want to behave as a grouping directive.
 
     context = GroupingContextDecorator(_context)