Commit bd1b818d authored by Andreas Jung's avatar Andreas Jung

Collector #2305: A comma inside an optional parameter of the

parameter string broke the ZScriptHTML_tryParams function.
parent 3fb86f36
...@@ -77,6 +77,10 @@ Zope Changes ...@@ -77,6 +77,10 @@ Zope Changes
- Collector #2306: Fixed broken glossary of Zope Tutorial - Collector #2306: Fixed broken glossary of Zope Tutorial
- Collector #2305: A comma inside an optional parameter of the
parameter string broke the ZScriptHTML_tryParams function.
Zope 2.4 alpha 1 Zope 2.4 alpha 1
......
...@@ -89,7 +89,7 @@ This product provides support for Script objects containing restricted ...@@ -89,7 +89,7 @@ This product provides support for Script objects containing restricted
Python code. Python code.
""" """
__version__='$Revision: 1.30 $'[11:-2] __version__='$Revision: 1.31 $'[11:-2]
import sys, os, traceback, re, marshal import sys, os, traceback, re, marshal
from Globals import DTMLFile, MessageDialog, package_home from Globals import DTMLFile, MessageDialog, package_home
...@@ -241,10 +241,12 @@ class PythonScript(Script, Historical, Cacheable): ...@@ -241,10 +241,12 @@ class PythonScript(Script, Historical, Cacheable):
def ZScriptHTML_tryParams(self): def ZScriptHTML_tryParams(self):
"""Parameters to test the script with.""" """Parameters to test the script with."""
print self._params
param_names = [] param_names = []
for name in self._params.split(','): for name in self._params.split(','):
name = name.strip() name = name.strip()
if name and name[0] != '*': if name and name[0] != '*' and re.match('\w',name):
param_names.append(name.split('=', 1)[0]) param_names.append(name.split('=', 1)[0])
return param_names return param_names
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment