mirror of
https://github.com/python/cpython.git
synced 2025-10-31 13:41:24 +00:00
b0871cac11
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r85510 | benjamin.peterson | 2010-10-14 18:00:04 -0500 (Thu, 14 Oct 2010) | 61 lines
Merged revisions 83852-83853,83857,84042,84216,84274-84276,84375,85388,85478,85506-85508 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line
wrap with parens
........
r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line
use parens
........
r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line
things which use touch_import should be pre order
........
r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines
This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers.
........
r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line
allow star_expr in testlist_gexp
........
r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line
wrap long line
........
r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line
cleanup
........
r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line
when there's a None value and a traceback, don't call type with it #9661
........
r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines
Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code.
........
r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line
fix urllib fixer with multiple as imports on a line #10069
........
r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line
stop abusing docstrings
........
r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line
kill sibling import
........
r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line
remove trailing whitespace
........
r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line
typo
........
................
110 lines
3.1 KiB
Python
110 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, parenthesize
|
|
|
|
|
|
class FixHasKey(fixer_base.BaseFix):
|
|
BM_compatible = True
|
|
|
|
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.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 = parenthesize(arg)
|
|
if len(before) == 1:
|
|
before = before[0]
|
|
else:
|
|
before = pytree.Node(syms.power, before)
|
|
before.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 = 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 = parenthesize(new)
|
|
new.prefix = prefix
|
|
return new
|