Mailman 3 January 2014 - Python-checkins

cpython: inspect: Add some comments in Parameter.__eq__ method
by yury.selivanov 31 Jan '14

31 Jan '14

http://hg.python.org/cpython/rev/c7233921b612 changeset: 88868:c7233921b612 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Fri Jan 31 15:30:30 2014 -0500 summary: inspect: Add some comments in Parameter.__eq__ method files: Lib/inspect.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1905,6 +1905,17 @@ id(self), self.name) def __eq__(self, other): + # NB: We deliberately do not compare '_partial_kwarg' attributes + # here. Imagine we have a following situation: + # + # def foo(a, b=1): pass + # def bar(a, b): pass + # bar2 = functools.partial(bar, b=1) + # + # For the above scenario, signatures for `foo` and `bar2` should + # be equal. '_partial_kwarg' attribute is an internal flag, to + # distinguish between keyword parameters with defaults and + # keyword parameters which got their defaults from functools.partial return (issubclass(other.__class__, Parameter) and self._name == other._name and self._kind == other._kind and -- Repository URL: http://hg.python.org/cpython

1 0

cpython: inspect.Signauture.from_function: validate duck functions in Signature
by yury.selivanov 31 Jan '14

31 Jan '14

http://hg.python.org/cpython/rev/8a91132ed6aa changeset: 88867:8a91132ed6aa user: Yury Selivanov <yselivanov(a)sprymix.com> date: Fri Jan 31 15:21:51 2014 -0500 summary: inspect.Signauture.from_function: validate duck functions in Signature constructor #17159 files: Lib/inspect.py | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -2097,10 +2097,14 @@ def from_function(cls, func): '''Constructs Signature for the given python function''' - if not (isfunction(func) or _signature_is_functionlike(func)): - # If it's not a pure Python function, and not a duck type - # of pure function: - raise TypeError('{!r} is not a Python function'.format(func)) + is_duck_function = False + if not isfunction(func): + if _signature_is_functionlike(func): + is_duck_function = True + else: + # If it's not a pure Python function, and not a duck type + # of pure function: + raise TypeError('{!r} is not a Python function'.format(func)) Parameter = cls._parameter_cls @@ -2164,9 +2168,11 @@ parameters.append(Parameter(name, annotation=annotation, kind=_VAR_KEYWORD)) + # Is 'func' is a pure Python function - don't validate the + # parameters list (for correct order and defaults), it should be OK. return cls(parameters, return_annotation=annotations.get('return', _empty), - __validate_parameters__=False) + __validate_parameters__=is_duck_function) @classmethod def from_builtin(cls, func): -- Repository URL: http://hg.python.org/cpython

1 0

cpython: inspect.signature: Support duck-types of Python functions (Cython, for
by yury.selivanov 31 Jan '14

31 Jan '14

http://hg.python.org/cpython/rev/32a660a52aae changeset: 88866:32a660a52aae user: Yury Selivanov <yselivanov(a)sprymix.com> date: Fri Jan 31 14:48:37 2014 -0500 summary: inspect.signature: Support duck-types of Python functions (Cython, for instance) #17159 files: Doc/whatsnew/3.4.rst | 4 + Lib/inspect.py | 32 ++++++++++++++- Lib/test/test_inspect.py | 60 ++++++++++++++++++++++++++++ Misc/NEWS | 3 + 4 files changed, 97 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -793,6 +793,10 @@ recommended to update your code to use :func:`~inspect.signature` directly. (Contributed by Yury Selivanov in :issue:`17481`) +:func:`~inspect.signature` now supports duck types of CPython functions, +which adds support for functions compiled with Cython. (Contributed +by Stefan Behnel and Yury Selivanov in :issue:`17159`) + logging ------- diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1601,6 +1601,30 @@ obj in (type, object)) +def _signature_is_functionlike(obj): + # Internal helper to test if `obj` is a duck type of FunctionType. + # A good example of such objects are functions compiled with + # Cython, which have all attributes that a pure Python function + # would have, but have their code statically compiled. + + if not callable(obj) or isclass(obj): + # All function-like objects are obviously callables, + # and not classes. + return False + + name = getattr(obj, '__name__', None) + code = getattr(obj, '__code__', None) + defaults = getattr(obj, '__defaults__', _void) # Important to use _void ... + kwdefaults = getattr(obj, '__kwdefaults__', _void) # ... and not None here + annotations = getattr(obj, '__annotations__', None) + + return (isinstance(code, types.CodeType) and + isinstance(name, str) and + (defaults is None or isinstance(defaults, tuple)) and + (kwdefaults is None or isinstance(kwdefaults, dict)) and + isinstance(annotations, dict)) + + def _signature_get_bound_param(spec): # Internal helper to get first parameter name from a # __text_signature__ of a builtin method, which should @@ -1670,7 +1694,9 @@ if _signature_is_builtin(obj): return Signature.from_builtin(obj) - if isinstance(obj, types.FunctionType): + if isfunction(obj) or _signature_is_functionlike(obj): + # If it's a pure Python function, or an object that is duck type + # of a Python function (Cython functions, for instance), then: return Signature.from_function(obj) if isinstance(obj, functools.partial): @@ -2071,7 +2097,9 @@ def from_function(cls, func): '''Constructs Signature for the given python function''' - if not isinstance(func, types.FunctionType): + if not (isfunction(func) or _signature_is_functionlike(func)): + # If it's not a pure Python function, and not a duck type + # of pure function: raise TypeError('{!r} is not a Python function'.format(func)) Parameter = cls._parameter_cls diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -1740,6 +1740,66 @@ with self.assertRaisesRegex(TypeError, 'is not a Python builtin'): inspect.Signature.from_builtin(42) + def test_signature_from_functionlike_object(self): + def func(a,b, *args, kwonly=True, kwonlyreq, **kwargs): + pass + + class funclike: + # Has to be callable, and have correct + # __code__, __annotations__, __defaults__, __name__, + # and __kwdefaults__ attributes + + def __init__(self, func): + self.__name__ = func.__name__ + self.__code__ = func.__code__ + self.__annotations__ = func.__annotations__ + self.__defaults__ = func.__defaults__ + self.__kwdefaults__ = func.__kwdefaults__ + self.func = func + + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) + + sig_func = inspect.Signature.from_function(func) + + sig_funclike = inspect.Signature.from_function(funclike(func)) + self.assertEqual(sig_funclike, sig_func) + + sig_funclike = inspect.signature(funclike(func)) + self.assertEqual(sig_funclike, sig_func) + + # If object is not a duck type of function, then + # signature will try to get a signature for its '__call__' + # method + fl = funclike(func) + del fl.__defaults__ + self.assertEqual(self.signature(fl), + ((('args', ..., ..., "var_positional"), + ('kwargs', ..., ..., "var_keyword")), + ...)) + + def test_signature_functionlike_class(self): + # We only want to duck type function-like objects, + # not classes. + + def func(a,b, *args, kwonly=True, kwonlyreq, **kwargs): + pass + + class funclike: + def __init__(self, marker): + pass + + __name__ = func.__name__ + __code__ = func.__code__ + __annotations__ = func.__annotations__ + __defaults__ = func.__defaults__ + __kwdefaults__ = func.__kwdefaults__ + + with self.assertRaisesRegex(TypeError, 'is not a Python function'): + inspect.Signature.from_function(funclike) + + self.assertEqual(str(inspect.signature(funclike)), '(marker)') + def test_signature_on_method(self): class Test: def __init__(*args): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,9 @@ Library ------- +- Issue #17159: inspect.signature now accepts duck types of functions, + which adds support for Cython functions. Initial patch by Stefan Behnel. + - Issue #18801: Fix inspect.classify_class_attrs to correctly classify object.__new__ and object.__init__. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: NEWS: Add news item for #18801
by yury.selivanov 31 Jan '14

31 Jan '14

http://hg.python.org/cpython/rev/d0f95094033d changeset: 88865:d0f95094033d user: Yury Selivanov <yselivanov(a)sprymix.com> date: Fri Jan 31 14:42:34 2014 -0500 summary: NEWS: Add news item for #18801 files: Misc/NEWS | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,9 @@ Library ------- +- Issue #18801: Fix inspect.classify_class_attrs to correctly classify + object.__new__ and object.__init__. + - Fixed cmath.isinf's name in its argument parsing code. - Issue #20311, #20452: poll and epoll now round the timeout away from zero, -- Repository URL: http://hg.python.org/cpython

1 0

cpython: inspect.classify_class_attrs: Classify object.__new__ and __init__ correctly
by yury.selivanov 31 Jan '14

31 Jan '14

http://hg.python.org/cpython/rev/c38f99554be4 changeset: 88864:c38f99554be4 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Fri Jan 31 14:28:44 2014 -0500 summary: inspect.classify_class_attrs: Classify object.__new__ and __init__ correctly #18801 files: Lib/inspect.py | 2 +- Lib/test/test_inspect.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -412,7 +412,7 @@ elif isinstance(dict_obj, property): kind = "property" obj = dict_obj - elif isfunction(obj) or ismethoddescriptor(obj): + elif isroutine(obj): kind = "method" else: kind = "data" diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -646,6 +646,10 @@ md = _BrokenMethodDescriptor() attrs = attrs_wo_objs(A) + + self.assertIn(('__new__', 'method', object), attrs, 'missing __new__') + self.assertIn(('__init__', 'method', object), attrs, 'missing __init__') + self.assertIn(('s', 'static method', A), attrs, 'missing static method') self.assertIn(('c', 'class method', A), attrs, 'missing class method') self.assertIn(('p', 'property', A), attrs, 'missing property') -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #20460: Merge with 3.3
by zach.ware 31 Jan '14

31 Jan '14

http://hg.python.org/cpython/rev/b56ce3410ca6 changeset: 88863:b56ce3410ca6 parent: 88861:681c86da0664 parent: 88862:7a611b7aae38 user: Zachary Ware <zachary.ware(a)gmail.com> date: Fri Jan 31 12:06:48 2014 -0600 summary: Issue #20460: Merge with 3.3 files: Doc/c-api/arg.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -515,7 +515,7 @@ ``None`` is returned. ``y`` (:class:`bytes`) [char \*] - This converts a C string to a Python :func:`bytes` object. If the C + This converts a C string to a Python :class:`bytes` object. If the C string pointer is *NULL*, ``None`` is returned. ``y#`` (:class:`bytes`) [char \*, int] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #20460: Render 'bytes' as a class, not a function.
by zach.ware 31 Jan '14

31 Jan '14

http://hg.python.org/cpython/rev/7a611b7aae38 changeset: 88862:7a611b7aae38 branch: 3.3 parent: 88860:d080214883aa user: Zachary Ware <zachary.ware(a)gmail.com> date: Fri Jan 31 12:06:14 2014 -0600 summary: Issue #20460: Render 'bytes' as a class, not a function. Patch by OSAMU NAKAMURA. files: Doc/c-api/arg.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -513,7 +513,7 @@ ``None`` is returned. ``y`` (:class:`bytes`) [char \*] - This converts a C string to a Python :func:`bytes` object. If the C + This converts a C string to a Python :class:`bytes` object. If the C string pointer is *NULL*, ``None`` is returned. ``y#`` (:class:`bytes`) [char \*, int] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Merge with 3.3
by zach.ware 31 Jan '14

31 Jan '14

http://hg.python.org/cpython/rev/681c86da0664 changeset: 88861:681c86da0664 parent: 88858:ffe73a516208 parent: 88860:d080214883aa user: Zachary Ware <zachary.ware(a)gmail.com> date: Fri Jan 31 11:31:14 2014 -0600 summary: Merge with 3.3 files: Doc/library/xml.rst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -29,6 +29,7 @@ The XML handling submodules are: * :mod:`xml.etree.ElementTree`: the ElementTree API, a simple and lightweight + XML processor .. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Fix unfinished thought in xml overview page. Suggested by Bo Bayles on docs@.
by zach.ware 31 Jan '14

31 Jan '14

http://hg.python.org/cpython/rev/d080214883aa changeset: 88860:d080214883aa branch: 3.3 parent: 88835:ecb272bae417 user: Zachary Ware <zachary.ware(a)gmail.com> date: Fri Jan 31 11:30:36 2014 -0600 summary: Fix unfinished thought in xml overview page. Suggested by Bo Bayles on docs@. files: Doc/library/xml.rst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -29,6 +29,7 @@ The XML handling submodules are: * :mod:`xml.etree.ElementTree`: the ElementTree API, a simple and lightweight + XML processor .. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix unfinished thought in xml overview page. Suggested by Bo Bayles on docs@.
by zach.ware 31 Jan '14

31 Jan '14

http://hg.python.org/cpython/rev/ea1f2f1f84a7 changeset: 88859:ea1f2f1f84a7 branch: 2.7 parent: 88842:78a721fa9b67 user: Zachary Ware <zachary.ware(a)gmail.com> date: Fri Jan 31 11:27:24 2014 -0600 summary: Fix unfinished thought in xml overview page. Suggested by Bo Bayles on docs@. files: Doc/library/xml.rst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Doc/library/xml.rst b/Doc/library/xml.rst --- a/Doc/library/xml.rst +++ b/Doc/library/xml.rst @@ -28,6 +28,7 @@ The XML handling submodules are: * :mod:`xml.etree.ElementTree`: the ElementTree API, a simple and lightweight + XML processor .. -- Repository URL: http://hg.python.org/cpython

1 0