mirror of
https://github.com/python/cpython.git
synced 2025-08-03 08:34:29 +00:00
Merged revisions 76063,76068 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76063 | benjamin.peterson | 2009-11-02 12:16:28 -0600 (Mon, 02 Nov 2009) | 77 lines
Merged revisions 76062 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r76062 | benjamin.peterson | 2009-11-02 12:12:12 -0600 (Mon, 02 Nov 2009) | 70 lines
Merged revisions 74359,75081,75088,75213,75278,75303,75427-75428,75734-75736,75865,76059-76061 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r74359 | benjamin.peterson | 2009-08-12 17:23:13 -0500 (Wed, 12 Aug 2009) | 1 line
don't pass the deprecated print_function option
........
r75081 | benjamin.peterson | 2009-09-26 22:02:57 -0500 (Sat, 26 Sep 2009) | 1 line
let 2to3 work with extended iterable unpacking
........
r75088 | benjamin.peterson | 2009-09-27 11:25:21 -0500 (Sun, 27 Sep 2009) | 1 line
look on the type only for __call__
........
r75213 | benjamin.peterson | 2009-10-03 10:09:46 -0500 (Sat, 03 Oct 2009) | 5 lines
revert 75212; it's not correct
People can use isinstance(x, collections.Callable) if they expect objects with
__call__ in their instance dictionaries.
........
r75278 | benjamin.peterson | 2009-10-07 16:25:56 -0500 (Wed, 07 Oct 2009) | 4 lines
fix whitespace problems with fix_idioms #3563
Patch by Joe Amenta.
........
r75303 | benjamin.peterson | 2009-10-09 16:59:11 -0500 (Fri, 09 Oct 2009) | 1 line
port latin-1 and utf-8 cookie improvements
........
r75427 | benjamin.peterson | 2009-10-14 20:35:57 -0500 (Wed, 14 Oct 2009) | 1 line
force floor division
........
r75428 | benjamin.peterson | 2009-10-14 20:39:21 -0500 (Wed, 14 Oct 2009) | 1 line
silence -3 warnings about __hash__
........
r75734 | benjamin.peterson | 2009-10-26 16:25:53 -0500 (Mon, 26 Oct 2009) | 2 lines
warn on map(None, ...) with more than 2 arguments #7203
........
r75735 | benjamin.peterson | 2009-10-26 16:28:25 -0500 (Mon, 26 Oct 2009) | 1 line
remove unused result
........
r75736 | benjamin.peterson | 2009-10-26 16:29:02 -0500 (Mon, 26 Oct 2009) | 1 line
using get() here is a bit pointless
........
r75865 | benjamin.peterson | 2009-10-27 15:49:00 -0500 (Tue, 27 Oct 2009) | 1 line
explain reason for warning
........
r76059 | benjamin.peterson | 2009-11-02 11:43:47 -0600 (Mon, 02 Nov 2009) | 1 line
tuples are no longer used for children
........
r76060 | benjamin.peterson | 2009-11-02 11:55:40 -0600 (Mon, 02 Nov 2009) | 1 line
revert r76059; apparently some fixers rely on Leaf no () for children
........
r76061 | benjamin.peterson | 2009-11-02 12:06:17 -0600 (Mon, 02 Nov 2009) | 1 line
make fix_tuple_params keep the tree valid #7253
........
................
................
r76068 | benjamin.peterson | 2009-11-02 12:30:48 -0600 (Mon, 02 Nov 2009) | 24 lines
Merged revisions 76064,76066-76067 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r76064 | benjamin.peterson | 2009-11-02 12:16:36 -0600 (Mon, 02 Nov 2009) | 1 line
add space
................
r76066 | benjamin.peterson | 2009-11-02 12:22:53 -0600 (Mon, 02 Nov 2009) | 9 lines
Merged revisions 76065 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r76065 | benjamin.peterson | 2009-11-02 12:21:25 -0600 (Mon, 02 Nov 2009) | 1 line
don't print stuff in tests
........
................
r76067 | benjamin.peterson | 2009-11-02 12:24:57 -0600 (Mon, 02 Nov 2009) | 1 line
enable test_parser in lib2to3
................
................
This commit is contained in:
Benjamin Peterson
parent
868b578929
commit
e80b51fab7
10 changed files with 118 additions and 23 deletions
|
|
@ -29,7 +29,7 @@ into
|
|||
|
||||
# Local imports
|
||||
from .. import fixer_base
|
||||
from ..fixer_util import Call, Comma, Name, Node, syms
|
||||
from ..fixer_util import Call, Comma, Name, Node, BlankLine, syms
|
||||
|
||||
CMP = "(n='!=' | '==' | 'is' | n=comp_op< 'is' 'not' >)"
|
||||
TYPE = "power< 'type' trailer< '(' x=any ')' > >"
|
||||
|
|
@ -130,5 +130,24 @@ class FixIdioms(fixer_base.BaseFix):
|
|||
else:
|
||||
raise RuntimeError("should not have reached here")
|
||||
sort_stmt.remove()
|
||||
if next_stmt:
|
||||
next_stmt[0].prefix = sort_stmt.prefix
|
||||
|
||||
btwn = sort_stmt.prefix
|
||||
# Keep any prefix lines between the sort_stmt and the list_call and
|
||||
# shove them right after the sorted() call.
|
||||
if "\n" in btwn:
|
||||
if next_stmt:
|
||||
# The new prefix should be everything from the sort_stmt's
|
||||
# prefix up to the last newline, then the old prefix after a new
|
||||
# line.
|
||||
prefix_lines = (btwn.rpartition("\n")[0], next_stmt[0].prefix)
|
||||
next_stmt[0].prefix = "\n".join(prefix_lines)
|
||||
else:
|
||||
assert list_call.parent
|
||||
assert list_call.next_sibling is None
|
||||
# Put a blank line after list_call and set its prefix.
|
||||
end_line = BlankLine()
|
||||
list_call.parent.append_child(end_line)
|
||||
assert list_call.next_sibling is end_line
|
||||
# The new prefix should be everything up to the first new line
|
||||
# of sort_stmt's prefix.
|
||||
end_line.prefix = btwn.rpartition("\n")[0]
|
||||
|
|
|
|||
|
|
@ -49,8 +49,7 @@ class FixMap(fixer_base.ConditionalFix):
|
|||
>
|
||||
|
|
||||
power<
|
||||
'map'
|
||||
args=trailer< '(' [any] ')' >
|
||||
'map' trailer< '(' [arglist=any] ')' >
|
||||
>
|
||||
"""
|
||||
|
||||
|
|
@ -66,13 +65,22 @@ class FixMap(fixer_base.ConditionalFix):
|
|||
new.prefix = ""
|
||||
new = Call(Name("list"), [new])
|
||||
elif "map_lambda" in results:
|
||||
new = ListComp(results.get("xp").clone(),
|
||||
results.get("fp").clone(),
|
||||
results.get("it").clone())
|
||||
new = ListComp(results["xp"].clone(),
|
||||
results["fp"].clone(),
|
||||
results["it"].clone())
|
||||
else:
|
||||
if "map_none" in results:
|
||||
new = results["arg"].clone()
|
||||
else:
|
||||
if "arglist" in results:
|
||||
args = results["arglist"]
|
||||
if args.type == syms.arglist and \
|
||||
args.children[0].type == token.NAME and \
|
||||
args.children[0].value == "None":
|
||||
self.warning(node, "cannot convert map(None, ...) "
|
||||
"with multiple arguments because map() "
|
||||
"now truncates to the shortest sequence")
|
||||
return
|
||||
if in_special_context(node):
|
||||
return None
|
||||
new = node.clone()
|
||||
|
|
|
|||
|
|
@ -96,6 +96,8 @@ class FixTupleParams(fixer_base.BaseFix):
|
|||
new_lines[0].prefix = indent
|
||||
after = start + 1
|
||||
|
||||
for line in new_lines:
|
||||
line.parent = suite[0]
|
||||
suite[0].children[after:after] = new_lines
|
||||
for i in range(after+1, after+len(new_lines)+1):
|
||||
suite[0].children[i].prefix = indent
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue