[Python-checkins] cpython (3.4): Issue #21629: Fix Argument Clinic's "--converters" feature.
larry.hastings
python-checkins at python.org
Wed Jun 11 13:31:05 CEST 2014
http://hg.python.org/cpython/rev/6b2db7fc17f7
changeset: 91127:6b2db7fc17f7
branch: 3.4
parent: 91125:11a920a26f13
user: Larry Hastings <larry at hastings.org>
date: Wed Jun 11 04:31:29 2014 -0700
summary:
Issue #21629: Fix Argument Clinic's "--converters" feature.
files:
Misc/NEWS | 5 +++++
Tools/clinic/clinic.py | 4 +---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -118,6 +118,11 @@
- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
updated to 1.0.1h.
+Tools/Demos
+-----------
+
+- Issue #21629: Fix Argument Clinic's "--converters" feature.
+
What's New in Python 3.4.1?
===========================
diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -2044,11 +2044,9 @@
# automatically add converter for default format unit
# (but without stomping on the existing one if it's already
# set, in case you subclass)
- if ((cls.format_unit != 'O&') and
+ if ((cls.format_unit not in ('O&', '')) and
(cls.format_unit not in legacy_converters)):
legacy_converters[cls.format_unit] = cls
- if cls.format_unit:
- legacy_converters[cls.format_unit] = cls
return cls
def add_legacy_c_converter(format_unit, **kwargs):
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list