Skip to content

C
cpython
Kaydet (Commit) d9d7567e authored tarafından Larry Hastings's avatar Larry Hastings
Dosyalara gözat
Seçenekler

Issue #21629: Merge from 3.4.

üst 99537627 f150378e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Misc/NEWS
Dosyayı görüntüle @ d9d7567e
...@@ -623,6 +623,8 @@ Tests ...@@ -623,6 +623,8 @@ Tests
Tools/Demos Tools/Demos
----------- -----------
- Issue #21629: Fix Argument Clinic's "--converters" feature.
- Add support for ``yield from`` to 2to3. - Add support for ``yield from`` to 2to3.
- Add support for the PEP 465 matrix multiplication operator to 2to3. - Add support for the PEP 465 matrix multiplication operator to 2to3.
......
Tools/clinic/clinic.py
Dosyayı görüntüle @ d9d7567e
...@@ -2044,11 +2044,9 @@ def add_default_legacy_c_converter(cls): ...@@ -2044,11 +2044,9 @@ def add_default_legacy_c_converter(cls):
# automatically add converter for default format unit # automatically add converter for default format unit
# (but without stomping on the existing one if it's already # (but without stomping on the existing one if it's already
# set, in case you subclass) # 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)): (cls.format_unit not in legacy_converters)):
legacy_converters[cls.format_unit] = cls legacy_converters[cls.format_unit] = cls
if cls.format_unit:
legacy_converters[cls.format_unit] = cls
return cls return cls
def add_legacy_c_converter(format_unit, **kwargs): def add_legacy_c_converter(format_unit, **kwargs):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment