mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Issue #21629: Merge from 3.4.

Browse source
This commit is contained in:
Larry Hastings 2014-06-11 04:36:09 -07:00
commit d9d7567eac
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -623,6 +623,8 @@ Tests
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.

4
Tools/clinic/clinic.py
View file

@ -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):