Allow assertions in Scripts

lib/python/Products/PythonScripts/Guarded.py

@@ -83,7 +83,7 @@
 # 
 ##############################################################################
 
-__version__='$Revision: 1.8 $'[11:-2]
+__version__='$Revision: 1.9 $'[11:-2]
 
 from zbytecodehacks.VSExec import SafeBlock, GuardedBinaryOps, \
      UntupleFunction, RedirectWrites, WriteGuard, RedirectReads, ReadGuard, \
@@ -108,9 +108,9 @@ for name in ('None', 'abs', 'chr', 'divmod', 'float', 'hash', 'hex', 'int',
 for name in ('range', 'pow', 'DateTime', 'test', 'namespace', 'render'):
     safebin[name] = getattr(safefuncs, name)
 
-for name in ('ArithmeticError', 'AttributeError', 'EOFError',
-             'EnvironmentError', 'FloatingPointError', 'IOError',
-             'ImportError', 'IndexError', 'KeyError',
+for name in ('ArithmeticError', 'AssertionError', 'AttributeError',
+             'EOFError', 'EnvironmentError', 'FloatingPointError',
+             'IOError', 'ImportError', 'IndexError', 'KeyError',
              'LookupError', 'NameError', 'OSError', 'OverflowError',
              'RuntimeError', 'StandardError', 'SyntaxError',
              'TypeError', 'ValueError', 'ZeroDivisionError',

lib/python/Products/PythonScripts/PythonScript.py

@@ -89,7 +89,7 @@ This product provides support for Script objects containing restricted
 Python code.
 """
 
-__version__='$Revision: 1.14 $'[11:-2]
+__version__='$Revision: 1.15 $'[11:-2]
 
 import sys, os, traceback, re
 from Globals import DTMLFile
@@ -270,7 +270,8 @@ class PythonScript(Script, Historical, Cacheable):
                                           join(self._v_errors, '\n') )
         return self._newfun(allowSideEffect, {'$guard': theGuard,
                                               '$write_guard': WriteGuard,
-                                              '$read_guard': ReadGuard},
+                                              '$read_guard': ReadGuard,
+                                              '__debug__': __debug__},
                             __builtins__=safebin)
 
     def _editedBindings(self):

lib/python/Products/PythonScripts/zbytecodehacks/VSExec.py

@@ -343,7 +343,7 @@ def PublicNames(cb, w, fc):
     '''
     protected = []
     for name in fc.co_names:
-        if name[:1]=='_' and len(name)>1:
+        if name[:1]=='_' and len(name)>1 and name != '__debug__':
             protected.append(name)
     if protected:
         raise SyntaxError, ('Names starting with "_" are not allowed (%s).'