[Zope-Checkins] SVN: Zope/hotfixes/Hotfix_20080812/trunk/__init__.py some cleanup
Andreas Jung
andreas at andreas-jung.com
Tue Aug 12 14:20:57 EDT 2008
Log message for revision 89748:
some cleanup
Changed:
U Zope/hotfixes/Hotfix_20080812/trunk/__init__.py
-=-
Modified: Zope/hotfixes/Hotfix_20080812/trunk/__init__.py
===================================================================
--- Zope/hotfixes/Hotfix_20080812/trunk/__init__.py 2008-08-12 18:18:43 UTC (rev 89747)
+++ Zope/hotfixes/Hotfix_20080812/trunk/__init__.py 2008-08-12 18:20:56 UTC (rev 89748)
@@ -10,6 +10,8 @@
# Python 2.5 and hopefully fixed in Python 2.4.6 release.
################################################################
+# Written by Marc-Andre Lemburg (mal at lemburg.com).
+# (c) Copyright CNRI, All Rights Reserved. NO WARRANTY.
def search_function(encoding):
@@ -92,6 +94,8 @@
return entry
+import encodings
+encodings.search_function.func_code = search_function.func_code
################################################################
@@ -99,16 +103,10 @@
# raise SystemExit exploit in PythonScripts
################################################################
-import encodings
-encodings.search_function.func_code = search_function.func_code
-
-
import new
from Products.PythonScripts.PythonScript import PythonScript, \
PythonScriptTracebackSupplement
-
-
def _exec(self, bound_names, args, kw):
"""Call a Python Script
@@ -162,4 +160,3 @@
PythonScript._exec = _exec
-
More information about the Zope-Checkins
mailing list