[z3-checkins] r49447 - z3/jsonserver/branch/merge/configfeature

[reebalazs at codespeak.net]

Author: reebalazs
Date: Thu Dec  6 12:36:26 2007
New Revision: 49447

Modified:
   z3/jsonserver/branch/merge/configfeature/fiveconfig.py
Log:
Compensate import error zope.component.location occuring on Zope 3.4

Modified: z3/jsonserver/branch/merge/configfeature/fiveconfig.py
==============================================================================
--- z3/jsonserver/branch/merge/configfeature/fiveconfig.py	(original)
+++ z3/jsonserver/branch/merge/configfeature/fiveconfig.py	Thu Dec  6 12:36:26 2007
@@ -45,12 +45,14 @@
 
 try:
     import zope.component.interface
-    import zope.component.location
+    # XXX this now fails on Zope 3.4, so
+    # commented out even if it gives bad result now
+    ##import zope.component.location
     __compat__.zope_pre_3_3 = False
 except ImportError:
     # The only supported pre_3_3 version is 3.2
     import zope.app.component.interface
-    import zope.app.location
+    ##import zope.app.location
     __compat__.zope_pre_3_3 = True
     
 try: