Make PS work with 2.2.0

zopefoundation · Dec 13, 2000 · 485638f · 485638f
1 parent 66ce4b9
commit 485638f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/Guarded.py b/Guarded.py
@@ -83,7 +83,7 @@
 # 
 ##############################################################################
 
-__version__='$Revision: 1.3 $'[11:-2]
+__version__='$Revision: 1.4 $'[11:-2]
 
 from zbytecodehacks.VSExec import SafeBlock, GuardedBinaryOps, \
      UntupleFunction, RedirectWrites, WriteGuard, RedirectReads, ReadGuard, \
@@ -92,10 +92,13 @@
 from DocumentTemplate.DT_Util import TemplateDict, \
      careful_pow, d, ValidationError
 from DocumentTemplate.DT_Var import special_formats
-from AccessControl import getSecurityManager, secureModule
-
-#import standard
-#standard.__allow_access_to_unprotected_subobjects__ = 1
+from AccessControl import getSecurityManager
+try:
+    from AccessControl import secureModule
+except:
+    # Allow pre-2.3 Zopes to operate without import capability
+    def secureModule(*args):
+        return
 
 safefuncs = TemplateDict()
 safebin = {}

diff --git a/__init__.py b/__init__.py
@@ -83,11 +83,13 @@
 # 
 ##############################################################################
 __doc__='''Python Scripts Product Initialization
-$Id: __init__.py,v 1.3 2000/12/07 22:35:12 michel Exp $'''
-__version__='$Revision: 1.3 $'[11:-2]
+$Id: __init__.py,v 1.4 2000/12/13 19:06:37 evan Exp $'''
+__version__='$Revision: 1.4 $'[11:-2]
 
 import PythonScript
-import standard
+try:
+    import standard
+except: pass
 
 __roles__ = None
 __allow_access_to_unprotected_subobjects__ = 1