From: Larry Hastings <larry@hastings.org>
Date: Wed, 11 Jun 2014 11:31:29 +0000 (-0700)
Subject: Issue #21629: Fix Argument Clinic's "--converters" feature.
X-Git-Tag: v3.4.2rc1~405
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f150378ef02081bdebf40d33ee2d9b286763b346;p=python

Issue #21629: Fix Argument Clinic's "--converters" feature.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index e718bcd121..4dbcc8c5ae 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -118,6 +118,11 @@ Windows
 - 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
index 68a14361fd..93e8f5a6b9 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -2044,11 +2044,9 @@ def add_default_legacy_c_converter(cls):
     # 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):