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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

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