mirror of
https://github.com/python/cpython.git
synced 2025-11-03 19:34:08 +00:00
df6dc8f107
svn+ssh://pythondev@svn.python.org/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://pythondev@svn.python.org/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.
........
................
109 lines
3.1 KiB
Python
109 lines
3.1 KiB
Python
# Copyright 2006 Google, Inc. All Rights Reserved.
|
|
# Licensed to PSF under a Contributor Agreement.
|
|
|
|
"""Fixer for has_key().
|
|
|
|
Calls to .has_key() methods are expressed in terms of the 'in'
|
|
operator:
|
|
|
|
d.has_key(k) -> k in d
|
|
|
|
CAVEATS:
|
|
1) While the primary target of this fixer is dict.has_key(), the
|
|
fixer will change any has_key() method call, regardless of its
|
|
class.
|
|
|
|
2) Cases like this will not be converted:
|
|
|
|
m = d.has_key
|
|
if m(k):
|
|
...
|
|
|
|
Only *calls* to has_key() are converted. While it is possible to
|
|
convert the above to something like
|
|
|
|
m = d.__contains__
|
|
if m(k):
|
|
...
|
|
|
|
this is currently not done.
|
|
"""
|
|
|
|
# Local imports
|
|
from .. import pytree
|
|
from ..pgen2 import token
|
|
from .. import fixer_base
|
|
from ..fixer_util import Name
|
|
|
|
|
|
class FixHasKey(fixer_base.BaseFix):
|
|
|
|
PATTERN = """
|
|
anchor=power<
|
|
before=any+
|
|
trailer< '.' 'has_key' >
|
|
trailer<
|
|
'('
|
|
( not(arglist | argument<any '=' any>) arg=any
|
|
| arglist<(not argument<any '=' any>) arg=any ','>
|
|
)
|
|
')'
|
|
>
|
|
after=any*
|
|
>
|
|
|
|
|
negation=not_test<
|
|
'not'
|
|
anchor=power<
|
|
before=any+
|
|
trailer< '.' 'has_key' >
|
|
trailer<
|
|
'('
|
|
( not(arglist | argument<any '=' any>) arg=any
|
|
| arglist<(not argument<any '=' any>) arg=any ','>
|
|
)
|
|
')'
|
|
>
|
|
>
|
|
>
|
|
"""
|
|
|
|
def transform(self, node, results):
|
|
assert results
|
|
syms = self.syms
|
|
if (node.parent.type == syms.not_test and
|
|
self.pattern.match(node.parent)):
|
|
# Don't transform a node matching the first alternative of the
|
|
# pattern when its parent matches the second alternative
|
|
return None
|
|
negation = results.get("negation")
|
|
anchor = results["anchor"]
|
|
prefix = node.get_prefix()
|
|
before = [n.clone() for n in results["before"]]
|
|
arg = results["arg"].clone()
|
|
after = results.get("after")
|
|
if after:
|
|
after = [n.clone() for n in after]
|
|
if arg.type in (syms.comparison, syms.not_test, syms.and_test,
|
|
syms.or_test, syms.test, syms.lambdef, syms.argument):
|
|
arg = self.parenthesize(arg)
|
|
if len(before) == 1:
|
|
before = before[0]
|
|
else:
|
|
before = pytree.Node(syms.power, before)
|
|
before.set_prefix(" ")
|
|
n_op = Name("in", prefix=" ")
|
|
if negation:
|
|
n_not = Name("not", prefix=" ")
|
|
n_op = pytree.Node(syms.comp_op, (n_not, n_op))
|
|
new = pytree.Node(syms.comparison, (arg, n_op, before))
|
|
if after:
|
|
new = self.parenthesize(new)
|
|
new = pytree.Node(syms.power, (new,) + tuple(after))
|
|
if node.parent.type in (syms.comparison, syms.expr, syms.xor_expr,
|
|
syms.and_expr, syms.shift_expr,
|
|
syms.arith_expr, syms.term,
|
|
syms.factor, syms.power):
|
|
new = self.parenthesize(new)
|
|
new.set_prefix(prefix)
|
|
return new
|