[Python-checkins] cpython: Mangle __parameters in __annotations__ dict properly. Issue #20625.
yury.selivanov
python-checkins at python.org
Tue Feb 18 18:50:08 CET 2014
http://hg.python.org/cpython/rev/a63327162063
changeset: 89256:a63327162063
user: Yury Selivanov <yselivanov at sprymix.com>
date: Tue Feb 18 12:49:41 2014 -0500
summary:
Mangle __parameters in __annotations__ dict properly. Issue #20625.
files:
Doc/whatsnew/3.4.rst | 4 ++++
Lib/test/test_grammar.py | 7 +++++++
Lib/test/test_inspect.py | 16 ++++++++++++++++
Misc/NEWS | 3 +++
Python/compile.c | 8 +++++++-
5 files changed, 37 insertions(+), 1 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
@@ -1781,6 +1781,10 @@
perpetually alive (for example, database connections kept in thread-local
storage). (:issue:`17094`.)
+* Parameter names in ``__annotations__`` dict are now mangled properly,
+ similarly to ``__kwdefaults__``. (Contributed by Yury Selivanov in
+ :issue:`20625`).
+
Changes in the C API
--------------------
diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py
--- a/Lib/test/test_grammar.py
+++ b/Lib/test/test_grammar.py
@@ -314,6 +314,13 @@
self.assertEqual(f.__annotations__,
{'b': 1, 'c': 2, 'e': 3, 'g': 6, 'h': 7, 'j': 9,
'k': 11, 'return': 12})
+ # Check for issue #20625 -- annotations mangling
+ class Spam:
+ def f(self, *, __kw:1):
+ pass
+ class Ham(Spam): pass
+ self.assertEquals(Spam.f.__annotations__, {'_Spam__kw': 1})
+ self.assertEquals(Ham.f.__annotations__, {'_Spam__kw': 1})
# Check for SF Bug #1697248 - mixing decorators and a return annotation
def null(x): return x
@null
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
@@ -2390,6 +2390,22 @@
self.assertEqual(sig.return_annotation, 42)
self.assertEqual(sig, inspect.signature(test))
+ def test_signature_on_mangled_parameters(self):
+ class Spam:
+ def foo(self, __p1:1=2, *, __p2:2=3):
+ pass
+ class Ham(Spam):
+ pass
+
+ self.assertEqual(self.signature(Spam.foo),
+ ((('self', ..., ..., "positional_or_keyword"),
+ ('_Spam__p1', 2, 1, "positional_or_keyword"),
+ ('_Spam__p2', 3, 2, "keyword_only")),
+ ...))
+
+ self.assertEqual(self.signature(Spam.foo),
+ self.signature(Ham.foo))
+
class TestParameterObject(unittest.TestCase):
def test_signature_parameter_kinds(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,9 @@
- Issue #20595: Make getargs.c C89 compliant.
+- Issue #20625: Parameter names in __annotations__ were not mangled properly.
+ Discovered by Jonas Wielicki, patch by Yury Selivanov.
+
Library
-------
diff --git a/Python/compile.c b/Python/compile.c
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1533,8 +1533,14 @@
{
if (annotation) {
VISIT(c, expr, annotation);
- if (PyList_Append(names, id))
+ PyObject *mangled = _Py_Mangle(c->u->u_private, id);
+ if (!mangled)
return -1;
+ if (PyList_Append(names, mangled) < 0) {
+ Py_DECREF(mangled);
+ return -1;
+ }
+ Py_DECREF(mangled);
}
return 0;
}
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list