Commit 47ca5f17 authored by Vincent Pelletier's avatar Vincent Pelletier

Fix magic "self" parameter detection.

Original code behaviour:
>>> def foo(self, a=None):
...    return 'works'
...
>>> context.foo(a=1)
works
>>> def foo(self, a):
...   return 'works'
...
>>> context.foo(1)
works
>>> context.foo(a=1)
TypeError: foo() takes exactly 2 non-keyword arguments (0 given)

New behaviour fixes this TypeError, to be closer to normal python
behaviour.
Also, original code was doing expensive checks before cheap ones.
parent bf363841
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
# #
############################################################################## ##############################################################################
from inspect import getargspec
from Products.ExternalMethod.ExternalMethod import * from Products.ExternalMethod.ExternalMethod import *
if 1: if 1:
...@@ -65,6 +66,8 @@ if 1: ...@@ -65,6 +66,8 @@ if 1:
Component Extension if available, otherwise fallback on filesystem Component Extension if available, otherwise fallback on filesystem
Extension Extension
- access volatile attribute safely - access volatile attribute safely
- fix magic "self" argument when positional arguments get their values
from kw.
""" """
try: try:
f = getattr(__import__('erp5.component.extension.' + self._module, f = getattr(__import__('erp5.component.extension.' + self._module,
...@@ -103,9 +106,13 @@ if 1: ...@@ -103,9 +106,13 @@ if 1:
except TypeError, v: except TypeError, v:
tb=sys.exc_info()[2] tb=sys.exc_info()[2]
try: try:
if ((self._v_func_code.co_argcount- func_args, func_varargs, _, func_defaults = getargspec(f)
len(self._v_func_defaults or ()) - 1 == len(args)) by_kw = set(kw)
and self._v_func_code.co_varnames[0]=='self'): if func_defaults:
by_kw.update(func_args[-len(func_defaults):])
if func_args[0] == 'self' and 'self' not in kw and (
func_varargs or len(set(func_args[len(args):]
).difference(by_kw)) == 1):
return f(self.aq_parent.this(), *args, **kw) return f(self.aq_parent.this(), *args, **kw)
raise TypeError, v, tb raise TypeError, v, tb
......
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