Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
223f12c9
Commit
223f12c9
authored
Sep 09, 2016
by
Gregory P. Smith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove 2to3's fix_callable... We reintroduced the callable built-in
pretty early on in the 3.x series (3.1 or 3.2?).
parent
935043d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
129 deletions
+0
-129
Lib/lib2to3/fixes/fix_callable.py
Lib/lib2to3/fixes/fix_callable.py
+0
-37
Lib/lib2to3/tests/test_fixers.py
Lib/lib2to3/tests/test_fixers.py
+0
-92
No files found.
Lib/lib2to3/fixes/fix_callable.py
deleted
100644 → 0
View file @
935043d1
# Copyright 2007 Google, Inc. All Rights Reserved.
# Licensed to PSF under a Contributor Agreement.
"""Fixer for callable().
This converts callable(obj) into isinstance(obj, collections.Callable), adding a
collections import if needed."""
# Local imports
from
lib2to3
import
fixer_base
from
lib2to3.fixer_util
import
Call
,
Name
,
String
,
Attr
,
touch_import
class
FixCallable
(
fixer_base
.
BaseFix
):
BM_compatible
=
True
order
=
"pre"
# Ignore callable(*args) or use of keywords.
# Either could be a hint that the builtin callable() is not being used.
PATTERN
=
"""
power< 'callable'
trailer< lpar='('
( not(arglist | argument<any '=' any>) func=any
| func=arglist<(not argument<any '=' any>) any ','> )
rpar=')' >
after=any*
>
"""
def
transform
(
self
,
node
,
results
):
func
=
results
[
'func'
]
touch_import
(
None
,
'collections'
,
node
=
node
)
args
=
[
func
.
clone
(),
String
(
', '
)]
args
.
extend
(
Attr
(
Name
(
'collections'
),
Name
(
'Callable'
)))
return
Call
(
Name
(
'isinstance'
),
args
,
prefix
=
node
.
prefix
)
Lib/lib2to3/tests/test_fixers.py
View file @
223f12c9
...
...
@@ -2919,98 +2919,6 @@ class Test_unicode(FixerTestCase):
a
=
f
+
r"""r'\\\u20ac\U0001d121\\u20ac'"""
self
.
check
(
b
,
a
)
class
Test_callable
(
FixerTestCase
):
fixer
=
"callable"
def
test_prefix_preservation
(
self
):
b
=
"""callable( x)"""
a
=
"""import collections
\
n
isinstance( x, collections.Callable)"""
self
.
check
(
b
,
a
)
b
=
"""if callable(x): pass"""
a
=
"""import collections
if isinstance(x, collections.Callable): pass"""
self
.
check
(
b
,
a
)
def
test_callable_call
(
self
):
b
=
"""callable(x)"""
a
=
"""import collections
\
n
isinstance(x, collections.Callable)"""
self
.
check
(
b
,
a
)
def
test_global_import
(
self
):
b
=
"""
def spam(foo):
callable(foo)"""
[
1
:]
a
=
"""
import collections
def spam(foo):
isinstance(foo, collections.Callable)"""
[
1
:]
self
.
check
(
b
,
a
)
b
=
"""
import collections
def spam(foo):
callable(foo)"""
[
1
:]
# same output if it was already imported
self
.
check
(
b
,
a
)
b
=
"""
from collections import *
def spam(foo):
callable(foo)"""
[
1
:]
a
=
"""
from collections import *
import collections
def spam(foo):
isinstance(foo, collections.Callable)"""
[
1
:]
self
.
check
(
b
,
a
)
b
=
"""
do_stuff()
do_some_other_stuff()
assert callable(do_stuff)"""
[
1
:]
a
=
"""
import collections
do_stuff()
do_some_other_stuff()
assert isinstance(do_stuff, collections.Callable)"""
[
1
:]
self
.
check
(
b
,
a
)
b
=
"""
if isinstance(do_stuff, Callable):
assert callable(do_stuff)
do_stuff(do_stuff)
if not callable(do_stuff):
exit(1)
else:
assert callable(do_stuff)
else:
assert not callable(do_stuff)"""
[
1
:]
a
=
"""
import collections
if isinstance(do_stuff, Callable):
assert isinstance(do_stuff, collections.Callable)
do_stuff(do_stuff)
if not isinstance(do_stuff, collections.Callable):
exit(1)
else:
assert isinstance(do_stuff, collections.Callable)
else:
assert not isinstance(do_stuff, collections.Callable)"""
[
1
:]
self
.
check
(
b
,
a
)
def
test_callable_should_not_change
(
self
):
a
=
"""callable(*x)"""
self
.
unchanged
(
a
)
a
=
"""callable(x, y)"""
self
.
unchanged
(
a
)
a
=
"""callable(x, kw=y)"""
self
.
unchanged
(
a
)
a
=
"""callable()"""
self
.
unchanged
(
a
)
class
Test_filter
(
FixerTestCase
):
fixer
=
"filter"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment