changeset:   91128:8b4b8f5d7321
parent:      91126:149cc6364180
parent:      91127:6b2db7fc17f7
user:        Larry Hastings <larry@hastings.org>
date:        Wed Jun 11 04:36:09 2014 -0700
files:       Misc/NEWS
description:
Issue #21629: Merge from 3.4.


diff -r 149cc6364180 -r 8b4b8f5d7321 Misc/NEWS
--- a/Misc/NEWS	Wed Jun 11 08:04:16 2014 +0100
+++ b/Misc/NEWS	Wed Jun 11 04:36:09 2014 -0700
@@ -623,6 +623,8 @@
 Tools/Demos
 -----------
 
+- Issue #21629: Fix Argument Clinic's "--converters" feature.
+
 - Add support for ``yield from`` to 2to3.
 
 - Add support for the PEP 465 matrix multiplication operator to 2to3.
diff -r 149cc6364180 -r 8b4b8f5d7321 Tools/clinic/clinic.py
--- a/Tools/clinic/clinic.py	Wed Jun 11 08:04:16 2014 +0100
+++ b/Tools/clinic/clinic.py	Wed Jun 11 04:36:09 2014 -0700
@@ -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):