[Checkins] SVN: z3c.form/trunk/s reduce the number of BBB hacks, as we assume a ZTK version set now

[Hano Schlichting]

Log message for revision 126422:
  reduce the number of BBB hacks, as we assume a ZTK version set now
  

Changed:
  U   z3c.form/trunk/setup.py
  U   z3c.form/trunk/src/z3c/form/compatibility.py

-=-
Modified: z3c.form/trunk/setup.py
===================================================================
--- z3c.form/trunk/setup.py	2012-05-21 20:55:01 UTC (rev 126421)
+++ z3c.form/trunk/setup.py	2012-05-21 20:58:50 UTC (rev 126422)
@@ -83,7 +83,6 @@
             'z3c.coverage',
             'z3c.template >= 1.3',
             'zc.sourcefactory',
-            'zope.app.component',
             'zope.app.container >= 3.7',
             'zope.app.testing',
             'zope.testing',
@@ -108,13 +107,10 @@
         'zope.interface',
         'zope.lifecycleevent',
         'zope.location',
-        'zope.pagetemplate', # >= 3.6.2 if z3c.pt is used
+        'zope.pagetemplate',  # >= 3.6.2 if z3c.pt is used
         'zope.publisher',
         'zope.schema >= 3.6.0',
         'zope.security',
-        # Since the required package depends on the versions of the other
-        # packages, do not require it directly. See extras_require.
-        #'zope.site' or 'zope.app.component',
         'zope.traversing',
         ],
     zip_safe=False,

Modified: z3c.form/trunk/src/z3c/form/compatibility.py
===================================================================
--- z3c.form/trunk/src/z3c/form/compatibility.py	2012-05-21 20:55:01 UTC (rev 126421)
+++ z3c.form/trunk/src/z3c/form/compatibility.py	2012-05-21 20:58:50 UTC (rev 126422)
@@ -12,36 +12,17 @@
 #
 ##############################################################################
 """Form and Widget Framework Interfaces
-
-$Id$
 """
 __docformat__ = "reStructuredText"
 
-import sys
-import types
 
 def addHooks():
     import zope.component
     try:
         from zope.component import hooks
-        return # yay, we have modern software
     except ImportError:
-        pass
-    try:
         from zope.site import hooks
         zope.component.hooks = hooks
-        return
-    except AttributeError:
-        #this is a crappy situation
-        import zope.location.interfaces
-        import zope.traversing.interfaces
-        zope.location.interfaces.IRoot = zope.traversing.interfaces.IContainmentRoot
-        import zope.site
-        import zope.app.component.hooks
-        zope.component.hooks = zope.app.component.hooks
-    except ImportError:
-        import zope.app.component.hooks
-        zope.component.hooks = zope.app.component.hooks
 
 
 def apply():