bpo-30143: 2to3 now generates a code that uses abstract collection classes by serhiy-storchaka · Pull Request #1262 · python/cpython · GitHub
Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 3 commits into from
Nov 16, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
251672b
bpo-30143: 2to3 now generates a code that uses abstract collection cl…
serhiy-storchaka Apr 23, 2017
696e3f2
Move NEWS to NEWS.d/.
serhiy-storchaka Oct 12, 2017
d42920e
Merge branch 'master' into lib2to3-collections-abc
serhiy-storchaka Oct 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Doc/library/2to3.rst
View file
Open in desktop
12 changes: 6 additions & 6 deletions Lib/lib2to3/fixes/fix_operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -63,13 +63,13 @@ def _repeat(self, node, results):
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):
Expand Down
8 changes: 4 additions & 4 deletions Lib/lib2to3/tests/test_fixers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4427,12 +4427,12 @@ def test_operator_sequenceIncludes(self):

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):
Expand Down Expand Up @@ -4478,12 +4478,12 @@ def test_bare_sequenceIncludes(self):

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):
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2017-10-12-19-05-54.bpo-30143.25_hU1.rst
View file
Open in desktop