traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-30143: 2to3 now generates a code that uses abstract collection classes (#1262) 

from collections.abc rather than collections.
This commit is contained in:
Serhiy Storchaka 2017-11-16 09:16:24 +02:00 committed by GitHub
parent a7368ac636
commit 0a2abdfca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Doc/library/2to3.rst
View File

@ -345,20 +345,20 @@ and off individually. They are described here in more detail.
Converts calls to various functions in the :mod:`operator` module to other,
but equivalent, function calls. When needed, the appropriate ``import``
statements are added, e.g. ``import collections``. The following mapping
statements are added, e.g. ``import collections.abc``. The following mapping
are made:
================================== ==========================================
================================== =============================================
From To
================================== ==========================================
================================== =============================================
``operator.isCallable(obj)`` ``hasattr(obj, '__call__')``
``operator.sequenceIncludes(obj)`` ``operator.contains(obj)``
``operator.isSequenceType(obj)`` ``isinstance(obj, collections.Sequence)``
``operator.isMappingType(obj)`` ``isinstance(obj, collections.Mapping)``
``operator.isSequenceType(obj)`` ``isinstance(obj, collections.abc.Sequence)``
``operator.isMappingType(obj)`` ``isinstance(obj, collections.abc.Mapping)``
``operator.isNumberType(obj)`` ``isinstance(obj, numbers.Number)``
``operator.repeat(obj, n)`` ``operator.mul(obj, n)``
``operator.irepeat(obj, n)`` ``operator.imul(obj, n)``
================================== ==========================================
================================== =============================================
.. 2to3fixer:: paren

12
Lib/lib2to3/fixes/fix_operator.py
View File

@ -2,8 +2,8 @@
operator.isCallable(obj) -> hasattr(obj, '__call__')
operator.sequenceIncludes(obj) -> operator.contains(obj)
operator.isSequenceType(obj) -> isinstance(obj, collections.Sequence)
operator.isMappingType(obj) -> isinstance(obj, collections.Mapping)
operator.isSequenceType(obj) -> isinstance(obj, collections.abc.Sequence)
operator.isMappingType(obj) -> isinstance(obj, collections.abc.Mapping)
operator.isNumberType(obj) -> isinstance(obj, numbers.Number)
operator.repeat(obj, n) -> operator.mul(obj, n)
operator.irepeat(obj, n) -> operator.imul(obj, n)
@ -63,13 +63,13 @@ class FixOperator(fixer_base.BaseFix):
def _irepeat(self, node, results):
return self._handle_rename(node, results, "imul")
@invocation("isinstance(%s, collections.Sequence)")
@invocation("isinstance(%s, collections.abc.Sequence)")
def _isSequenceType(self, node, results):
return self._handle_type2abc(node, results, "collections", "Sequence")
return self._handle_type2abc(node, results, "collections.abc", "Sequence")
@invocation("isinstance(%s, collections.Mapping)")
@invocation("isinstance(%s, collections.abc.Mapping)")
def _isMappingType(self, node, results):
return self._handle_type2abc(node, results, "collections", "Mapping")
return self._handle_type2abc(node, results, "collections.abc", "Mapping")
@invocation("isinstance(%s, numbers.Number)")
def _isNumberType(self, node, results):

8
Lib/lib2to3/tests/test_fixers.py
View File

@ -4427,12 +4427,12 @@ class Test_operator(FixerTestCase):
def test_operator_isSequenceType(self):
b = "operator.isSequenceType(x)"
a = "import collections\nisinstance(x, collections.Sequence)"
a = "import collections.abc\nisinstance(x, collections.abc.Sequence)"
self.check(b, a)
def test_operator_isMappingType(self):
b = "operator.isMappingType(x)"
a = "import collections\nisinstance(x, collections.Mapping)"
a = "import collections.abc\nisinstance(x, collections.abc.Mapping)"
self.check(b, a)
def test_operator_isNumberType(self):
@ -4478,12 +4478,12 @@ class Test_operator(FixerTestCase):
def test_bare_operator_isSequenceType(self):
s = "isSequenceType(z)"
t = "You should use 'isinstance(z, collections.Sequence)' here."
t = "You should use 'isinstance(z, collections.abc.Sequence)' here."
self.warns_unchanged(s, t)
def test_bare_operator_isMappingType(self):
s = "isMappingType(x)"
t = "You should use 'isinstance(x, collections.Mapping)' here."
t = "You should use 'isinstance(x, collections.abc.Mapping)' here."
self.warns_unchanged(s, t)
def test_bare_operator_isNumberType(self):

2
Misc/NEWS.d/next/Library/2017-10-12-19-05-54.bpo-30143.25_hU1.rst Normal file
View File

@ -0,0 +1,2 @@
2to3 now generates a code that uses abstract collection classes from
collections.abc rather than collections.