Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit df6dc8f

Browse files
benjaminpbenjaminp
committed
Merged revisions 64286 via svnmerge from
svn+ssh://[email protected]/python/trunk ................ r64286 | benjamin.peterson | 2008-06-14 21:31:05 -0500 (Sat, 14 Jun 2008) | 49 lines Merged revisions 63661,63666,63695,63711,63729,63769,63790,63880,63886 via svnmerge from svn+ssh://[email protected]/sandbox/trunk/2to3/lib2to3 ........ r63661 | georg.brandl | 2008-05-26 05:26:20 -0500 (Mon, 26 May 2008) | 2 lines Add import fixes for dbm package. ........ r63666 | georg.brandl | 2008-05-26 05:49:09 -0500 (Mon, 26 May 2008) | 2 lines Add xmlrpc package fixes. ........ r63695 | georg.brandl | 2008-05-26 10:14:33 -0500 (Mon, 26 May 2008) | 2 lines Add fixer entries for http package. ........ r63711 | benjamin.peterson | 2008-05-26 13:43:51 -0500 (Mon, 26 May 2008) | 2 lines add import mapping for test.test_support -> test.support ........ r63729 | benjamin.peterson | 2008-05-26 16:31:03 -0500 (Mon, 26 May 2008) | 2 lines mapping for commands module -> subprocess ........ r63769 | brett.cannon | 2008-05-29 00:13:13 -0500 (Thu, 29 May 2008) | 1 line Fixer for UserString.UserString over to the collections module. ........ r63790 | brett.cannon | 2008-05-29 14:13:51 -0500 (Thu, 29 May 2008) | 4 lines Add a fixer for UserList. Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch. ........ r63880 | collin.winter | 2008-06-01 18:09:38 -0500 (Sun, 01 Jun 2008) | 6 lines Move lib2to3/fixes/{basefix,util}.py down to lib2to3/. This is step 1 of turning lib2to3/ into a general-purpose refactoring library, reusable by other projects. ........ r63886 | collin.winter | 2008-06-01 22:15:01 -0500 (Sun, 01 Jun 2008) | 5 lines Allow refactoring tools to specify a directory for fixer modules. This is step 2 of turning lib2to3/ into a general-purpose refactoring library, reusable by other projects. Step 1: r63880. ........ ................
1 parent 979f311 commit df6dc8f

46 files changed

Lines changed: 277 additions & 158 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Lib/lib2to3/fixes/basefix.py renamed to Lib/lib2to3/fixer_base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
from sets import Set as set
1515

1616
# Local imports
17-
from ..patcomp import PatternCompiler
18-
from .. import pygram
19-
from .util import does_tree_import
17+
from .patcomp import PatternCompiler
18+
from . import pygram
19+
from .fixer_util import does_tree_import
2020

2121
class BaseFix(object):
2222

Lib/lib2to3/fixes/util.py renamed to Lib/lib2to3/fixer_util.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# Author: Collin Winter
33

44
# Local imports
5-
from ..pgen2 import token
6-
from ..pytree import Leaf, Node
7-
from ..pygram import python_symbols as syms
8-
from .. import patcomp
5+
from .pgen2 import token
6+
from .pytree import Leaf, Node
7+
from .pygram import python_symbols as syms
8+
from . import patcomp
99

1010

1111
###########################################################
@@ -345,7 +345,7 @@ def _is_import_binding(node, name, package=None):
345345
elif imp.type == token.NAME and imp.value == name:
346346
return node
347347
elif node.type == syms.import_from:
348-
# unicode(...) is used to make life easier here, because
348+
# str(...) is used to make life easier here, because
349349
# from a.b import parses to ['import', ['a', '.', 'b'], ...]
350350
if package and str(node.children[1]).strip() != package:
351351
return None

‎Lib/lib2to3/fixes/fix_apply.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
# Local imports
99
from .. import pytree
1010
from ..pgen2 import token
11-
from . import basefix
12-
from .util import Call, Comma
11+
from .. import fixer_base
12+
from ..fixer_util import Call, Comma
1313

14-
class FixApply(basefix.BaseFix):
14+
class FixApply(fixer_base.BaseFix):
1515

1616
PATTERN = """
1717
power< 'apply'

‎Lib/lib2to3/fixes/fix_basestring.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# Author: Christian Heimes
33

44
# Local imports
5-
from . import basefix
6-
from .util import Name
5+
from .. import fixer_base
6+
from ..fixer_util import Name
77

8-
class FixBasestring(basefix.BaseFix):
8+
class FixBasestring(fixer_base.BaseFix):
99

1010
PATTERN = "'basestring'"
1111

‎Lib/lib2to3/fixes/fix_buffer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"""Fixer that changes buffer(...) into memoryview(...)."""
55

66
# Local imports
7-
from . import basefix
8-
from .util import Name
7+
from .. import fixer_base
8+
from ..fixer_util import Name
99

1010

11-
class FixBuffer(basefix.BaseFix):
11+
class FixBuffer(fixer_base.BaseFix):
1212

1313
explicit = True # The user must ask for this fixer
1414

‎Lib/lib2to3/fixes/fix_callable.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
# Local imports
99
from .. import pytree
10-
from . import basefix
11-
from .util import Call, Name, String
10+
from .. import fixer_base
11+
from ..fixer_util import Call, Name, String
1212

13-
class FixCallable(basefix.BaseFix):
13+
class FixCallable(fixer_base.BaseFix):
1414

1515
# Ignore callable(*args) or use of keywords.
1616
# Either could be a hint that the builtin callable() is not being used.

‎Lib/lib2to3/fixes/fix_dict.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
from .. import pytree
2828
from .. import patcomp
2929
from ..pgen2 import token
30-
from . import basefix
31-
from .util import Name, Call, LParen, RParen, ArgList, Dot, set
32-
from . import util
30+
from .. import fixer_base
31+
from ..fixer_util import Name, Call, LParen, RParen, ArgList, Dot, set
32+
from .. import fixer_util
3333

3434

35-
iter_exempt = util.consuming_calls | set(["iter"])
35+
iter_exempt = fixer_util.consuming_calls | set(["iter"])
3636

3737

38-
class FixDict(basefix.BaseFix):
38+
class FixDict(fixer_base.BaseFix):
3939
PATTERN = """
4040
power< head=any+
4141
trailer< '.' method=('keys'|'items'|'values'|
@@ -92,7 +92,7 @@ def in_special_context(self, node, isiter):
9292
return results["func"].value in iter_exempt
9393
else:
9494
# list(d.keys()) -> list(d.keys()), etc.
95-
return results["func"].value in util.consuming_calls
95+
return results["func"].value in fixer_util.consuming_calls
9696
if not isiter:
9797
return False
9898
# for ... in d.iterkeys() -> for ... in d.keys(), etc.

‎Lib/lib2to3/fixes/fix_except.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424
# Local imports
2525
from .. import pytree
2626
from ..pgen2 import token
27-
from . import basefix
28-
from .util import Assign, Attr, Name, is_tuple, is_list, reversed
27+
from .. import fixer_base
28+
from ..fixer_util import Assign, Attr, Name, is_tuple, is_list, reversed
2929

3030
def find_excepts(nodes):
3131
for i, n in enumerate(nodes):
3232
if isinstance(n, pytree.Node):
3333
if n.children[0].value == 'except':
3434
yield (n, nodes[i+2])
3535

36-
class FixExcept(basefix.BaseFix):
36+
class FixExcept(fixer_base.BaseFix):
3737

3838
PATTERN = """
3939
try_stmt< 'try' ':' suite

‎Lib/lib2to3/fixes/fix_exec.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
# Local imports
1313
from .. import pytree
14-
from . import basefix
15-
from .util import Comma, Name, Call
14+
from .. import fixer_base
15+
from ..fixer_util import Comma, Name, Call
1616

1717

18-
class FixExec(basefix.BaseFix):
18+
class FixExec(fixer_base.BaseFix):
1919

2020
PATTERN = """
2121
exec_stmt< 'exec' a=any 'in' b=any [',' c=any] >

‎Lib/lib2to3/fixes/fix_execfile.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"""
99

1010
from .. import pytree
11-
from . import basefix
12-
from .util import Comma, Name, Call, LParen, RParen, Dot
11+
from .. import fixer_base
12+
from ..fixer_util import Comma, Name, Call, LParen, RParen, Dot
1313

1414

15-
class FixExecfile(basefix.BaseFix):
15+
class FixExecfile(fixer_base.BaseFix):
1616

1717
PATTERN = """
1818
power< 'execfile' trailer< '(' arglist< filename=any [',' globals=any [',' locals=any ] ] > ')' > >

0 commit comments

Comments
 (0)