Merged r72753:72754 from 2.9 branch.

Raise SyntaxError when encountering invalid PythonScript headers.
zopefoundation · Feb 22, 2007 · c6b7c27 · c6b7c27
1 parent 9c5fd81
commit c6b7c27
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 441 deletions.
diff --git a/PythonScript.py b/PythonScript.py
@@ -20,7 +20,7 @@
 __version__='$Revision: 1.56 $'[11:-2]
 
 import sys, os, traceback, re, marshal, new
-import logging
+from logging import getLogger
 from Globals import DTMLFile, MessageDialog, package_home
 import AccessControl, OFS, RestrictedPython
 from Acquisition import aq_parent
@@ -34,10 +34,11 @@
 from OFS.History import Historical, html_diff
 from OFS.Cache import Cacheable
 from AccessControl.ZopeGuards import get_safe_globals, guarded_getattr
+
 from zExceptions import Forbidden
 import Globals
 
-LOG = logging.getLogger('Script (Python)')
+LOG = getLogger('PythonScripts')
 
 # Track the Python bytecode version
 import imp
@@ -440,7 +441,7 @@ def write(self, text):
             else:
                 self._makeFunction()
         except:
-            LOG.error('write failed', exc_info=True)
+            LOG.error('write failed', exc_info=sys.exc_info())
             raise
 
     def manage_FTPget(self):

diff --git a/Utility.py b/Utility.py
diff --git a/__init__.py b/__init__.py
diff --git a/help/PythonScript.py b/help/PythonScript.py
diff --git a/help/Script.py b/help/Script.py