Commit d2281edd authored by wenjie.zheng's avatar wenjie.zheng

PythonScript.py: Delete _params if it's an empty string, to avoid NoneType...

PythonScript.py: Delete _params if it's an empty string, to avoid NoneType parameters from generating.
parent 82e7b164
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# Copyright (c) 2010 Nexedi SARL and Contributors. All Rights Reserved. # Copyright (c) 2010 Nexedi SARL and Contributors. All Rights Reserved.
# Sebastien Robin <seb@nexedi.com> # Sebastien Robin <seb@nexedi.com>
# # Wenjie Zheng <wenjie.zheng@tiolive.com>
# WARNING: This program as such is intended to be used by professional # WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsability of assessing all potential # programmers who take the whole responsability of assessing all potential
# consequences resulting from its eventual inadequacies and bugs # consequences resulting from its eventual inadequacies and bugs
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
############################################################################## ##############################################################################
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
from AccessControl.class_init import InitializeClass
from Products.ERP5Type import Permissions, PropertySheet from Products.ERP5Type import Permissions, PropertySheet
from App.special_dtml import HTMLFile from App.special_dtml import HTMLFile
from Products.ERP5Type.XMLObject import XMLObject from Products.ERP5Type.XMLObject import XMLObject
...@@ -109,7 +109,12 @@ class PythonScript(XMLObject, ZopePythonScript): ...@@ -109,7 +109,12 @@ class PythonScript(XMLObject, ZopePythonScript):
""" """
override to call ZopePythonScript methods to force compiling code override to call ZopePythonScript methods to force compiling code
""" """
if value is None:
value = ''
self._baseSetParameterSignature(value) self._baseSetParameterSignature(value)
if self._params is None or '':
### zwj: avoid NoneType parameters from generating in ZHtml edit page
delattr(self, "_params")
self._compile() self._compile()
def _setProxyRoleList(self, value): def _setProxyRoleList(self, value):
...@@ -127,3 +132,5 @@ class PythonScript(XMLObject, ZopePythonScript): ...@@ -127,3 +132,5 @@ class PythonScript(XMLObject, ZopePythonScript):
# We need to take __setstate__ from ZopePythonScript in order to # We need to take __setstate__ from ZopePythonScript in order to
# generate _v_ft attributes which is necessary to run the script # generate _v_ft attributes which is necessary to run the script
__setstate__ = ZopePythonScript.__setstate__ __setstate__ = ZopePythonScript.__setstate__
InitializeClass(PythonScript)
\ No newline at end of file
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