From 19439f2b4fd0dfadaa737cb15b7c3c97aa1948e1 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Wed, 10 May 2017 16:11:36 +0200 Subject: [PATCH] - drop old func_ aliases and fix chained assignment issues --- src/App/special_dtml.py | 8 ++++---- src/OFS/DTMLMethod.py | 4 ++-- src/Products/PageTemplates/PageTemplateFile.py | 4 ++-- src/Products/PageTemplates/ZopePageTemplate.py | 4 ++-- src/Shared/DC/Scripts/Script.py | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/App/special_dtml.py b/src/App/special_dtml.py index acbeb0ae72..f6efc6963a 100644 --- a/src/App/special_dtml.py +++ b/src/App/special_dtml.py @@ -48,10 +48,10 @@ class HTML(DocumentTemplate.HTML, Persistence.Persistent): class ClassicHTMLFile(DocumentTemplate.HTMLFile, MethodObject.Method): "Persistent HTML Document Templates read from files" - __code__ = func_code = Code() + __code__ = Code() __code__.co_varnames = 'trueself', 'self', 'REQUEST' __code__.co_argcount = 3 - __defaults__ = func_defaults = None + __defaults__ = None _need__name__ = 1 _v_last_read = 0 @@ -104,8 +104,8 @@ def __call__(self, *args, **kw): class DTMLFile(Bindings, Explicit, ClassicHTMLFile): "HTMLFile with bindings and support for __render_with_namespace__" - __code__ = func_code = None - __defaults__ = func_defaults = None + __code__ = None + __defaults__ = None _need__name__ = 1 _Bindings_ns_class = TemplateDict diff --git a/src/OFS/DTMLMethod.py b/src/OFS/DTMLMethod.py index 5af3025b5d..75cf312f2b 100644 --- a/src/OFS/DTMLMethod.py +++ b/src/OFS/DTMLMethod.py @@ -68,10 +68,10 @@ class DTMLMethod(RestrictedDTML, security = ClassSecurityInfo() security.declareObjectProtected(View) - __code__ = func_code = Code() + __code__ = Code() __code__.co_varnames = 'self', 'REQUEST', 'RESPONSE' __code__.co_argcount = 3 - __defaults__ = func_defaults = None + __defaults__ = None manage_options = (( {'label': 'Edit', 'action': 'manage_main'}, diff --git a/src/Products/PageTemplates/PageTemplateFile.py b/src/Products/PageTemplates/PageTemplateFile.py index 7f9a63ccfc..08da938f74 100644 --- a/src/Products/PageTemplates/PageTemplateFile.py +++ b/src/Products/PageTemplates/PageTemplateFile.py @@ -55,8 +55,8 @@ class PageTemplateFile(SimpleItem, Script, PageTemplate, Traversable): meta_type = 'Page Template (File)' - __code__ = func_code = FuncCode((), 0) - __defaults__ = func_defaults = None + __code__ = FuncCode((), 0) + __defaults__ = None _v_last_read = 0 # needed by AccessControl.class_init.InitializeClass diff --git a/src/Products/PageTemplates/ZopePageTemplate.py b/src/Products/PageTemplates/ZopePageTemplate.py index 2834669804..e4d8dcbfba 100644 --- a/src/Products/PageTemplates/ZopePageTemplate.py +++ b/src/Products/PageTemplates/ZopePageTemplate.py @@ -78,8 +78,8 @@ class ZopePageTemplate(Script, PageTemplate, Cacheable, meta_type = 'Page Template' output_encoding = 'utf-8' # provide default for old instances - __code__ = func_code = FuncCode((), 0) - __defaults__ = func_defaults = None + __code__ = FuncCode((), 0) + __defaults__ = None _default_bindings = {'name_subpath': 'traverse_subpath'} _default_content_fn = os.path.join(package_home(globals()), diff --git a/src/Shared/DC/Scripts/Script.py b/src/Shared/DC/Scripts/Script.py index 16734c1a11..9b6bc63dcb 100644 --- a/src/Shared/DC/Scripts/Script.py +++ b/src/Shared/DC/Scripts/Script.py @@ -33,8 +33,8 @@ class Script(SimpleItem, BindingsUI): security = ClassSecurityInfo() index_html = None - __code__ = func_code = None - __defaults__ = func_defaults = () + __code__ = None + __defaults__ = () _Bindings_ns_class = TemplateDict from .Signature import _setFuncSignature