From ffa94b0f022a697dd491a0c31acd2e3b2629c048 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 29 Dec 2009 00:06:20 +0000 Subject: Merged revisions 77102 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r77102 | benjamin.peterson | 2009-12-28 17:50:41 -0600 (Mon, 28 Dec 2009) | 50 lines Merged revisions 76871-76872,77093-77095,77097-77101 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r76871 | benjamin.peterson | 2009-12-17 20:49:21 -0600 (Thu, 17 Dec 2009) | 1 line handle unencodable diffs gracefully #5093 ........ r76872 | benjamin.peterson | 2009-12-17 20:51:37 -0600 (Thu, 17 Dec 2009) | 1 line fix emacs header ........ r77093 | benjamin.peterson | 2009-12-28 14:43:32 -0600 (Mon, 28 Dec 2009) | 7 lines replace callable(x) with isinstance(x, collections.Callable) #7006 This is a more accurate translation than hasattr(x, '__call__') which failed in the case that somebody had put __call__ in the instance dictionary. Patch mostly by Joe Amenta. ........ r77094 | benjamin.peterson | 2009-12-28 14:45:13 -0600 (Mon, 28 Dec 2009) | 2 lines deuglify imports ........ r77095 | benjamin.peterson | 2009-12-28 14:49:23 -0600 (Mon, 28 Dec 2009) | 1 line remove unused flag ........ r77097 | benjamin.peterson | 2009-12-28 16:12:13 -0600 (Mon, 28 Dec 2009) | 2 lines clean up imports and whitespace ........ r77098 | benjamin.peterson | 2009-12-28 16:43:35 -0600 (Mon, 28 Dec 2009) | 1 line *** empty log message *** ........ r77099 | benjamin.peterson | 2009-12-28 16:45:10 -0600 (Mon, 28 Dec 2009) | 1 line revert unintended change ........ r77100 | benjamin.peterson | 2009-12-28 16:53:21 -0600 (Mon, 28 Dec 2009) | 1 line revert unintended changes ........ r77101 | benjamin.peterson | 2009-12-28 17:46:02 -0600 (Mon, 28 Dec 2009) | 1 line normalize whitespace ........ ................ --- Lib/lib2to3/fixer_util.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Lib/lib2to3/fixer_util.py') diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py index 5c0a08858d..e6f7cdff80 100644 --- a/Lib/lib2to3/fixer_util.py +++ b/Lib/lib2to3/fixer_util.py @@ -291,8 +291,6 @@ def touch_import(package, name, node): if does_tree_import(package, name, root): return - add_newline_before = False - # figure out where to insert the new import. First try to find # the first import and then skip to the last one. insert_pos = offset = 0 @@ -312,7 +310,6 @@ def touch_import(package, name, node): if node.type == syms.simple_stmt and node.children and \ node.children[0].type == token.STRING: insert_pos = idx + 1 - add_newline_before break if package is None: @@ -324,8 +321,6 @@ def touch_import(package, name, node): import_ = FromImport(package, [Leaf(token.NAME, name, prefix=' ')]) children = [import_, Newline()] - if add_newline_before: - children.insert(0, Newline()) root.insert_child(insert_pos, Node(syms.simple_stmt, children)) -- cgit v1.2.1