[Python-checkins] r77107 - in python/branches/release31-maint: Lib/lib2to3/fixer_util.py Lib/lib2to3/fixes/fix_callable.py Lib/lib2to3/main.py Lib/lib2to3/tests/test_all_fixers.py Lib/lib2to3/tests/test_fixers.py Lib/lib2to3/tests/test_main.py Lib/test/test_lib2to3.py

Tue Dec 29 01:44:14 CET 2009

Author: benjamin.peterson
Date: Tue Dec 29 01:44:14 2009
New Revision: 77107
Log:
Merged revisions 77103,77105-77106 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r77103 | benjamin.peterson | 2009年12月28日 18:06:20 -0600 (2009年12月28日) | 57 lines
 
 Merged revisions 77102 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ................
 r77102 | benjamin.peterson | 2009年12月28日 17:50:41 -0600 (2009年12月28日) | 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 (2009年12月17日) | 1 line
 
 handle unencodable diffs gracefully #5093
 ........
 r76872 | benjamin.peterson | 2009年12月17日 20:51:37 -0600 (2009年12月17日) | 1 line
 
 fix emacs header
 ........
 r77093 | benjamin.peterson | 2009年12月28日 14:43:32 -0600 (2009年12月28日) | 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 (2009年12月28日) | 2 lines
 
 deuglify imports
 ........
 r77095 | benjamin.peterson | 2009年12月28日 14:49:23 -0600 (2009年12月28日) | 1 line
 
 remove unused flag
 ........
 r77097 | benjamin.peterson | 2009年12月28日 16:12:13 -0600 (2009年12月28日) | 2 lines
 
 clean up imports and whitespace
 ........
 r77098 | benjamin.peterson | 2009年12月28日 16:43:35 -0600 (2009年12月28日) | 1 line
 
 *** empty log message ***
 ........
 r77099 | benjamin.peterson | 2009年12月28日 16:45:10 -0600 (2009年12月28日) | 1 line
 
 revert unintended change
 ........
 r77100 | benjamin.peterson | 2009年12月28日 16:53:21 -0600 (2009年12月28日) | 1 line
 
 revert unintended changes
 ........
 r77101 | benjamin.peterson | 2009年12月28日 17:46:02 -0600 (2009年12月28日) | 1 line
 
 normalize whitespace
 ........
 ................
................
 r77105 | benjamin.peterson | 2009年12月28日 18:37:04 -0600 (2009年12月28日) | 1 line
 
 fix test on py3
................
 r77106 | benjamin.peterson | 2009年12月28日 18:38:47 -0600 (2009年12月28日) | 9 lines
 
 Merged revisions 77104 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r77104 | benjamin.peterson | 2009年12月28日 18:09:33 -0600 (2009年12月28日) | 1 line
 
 enable test_main.py
 ........
................
Added:
 python/branches/release31-maint/Lib/lib2to3/tests/test_main.py
 - copied unchanged from r77106, /python/branches/py3k/Lib/lib2to3/tests/test_main.py
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/lib2to3/fixer_util.py
 python/branches/release31-maint/Lib/lib2to3/fixes/fix_callable.py
 python/branches/release31-maint/Lib/lib2to3/main.py
 python/branches/release31-maint/Lib/lib2to3/tests/test_all_fixers.py
 python/branches/release31-maint/Lib/lib2to3/tests/test_fixers.py
 python/branches/release31-maint/Lib/test/test_lib2to3.py
Modified: python/branches/release31-maint/Lib/lib2to3/fixer_util.py
==============================================================================

--- python/branches/release31-maint/Lib/lib2to3/fixer_util.py	(original)
+++ python/branches/release31-maint/Lib/lib2to3/fixer_util.py	Tue Dec 29 01:44:14 2009
@@ -291,8 +291,6 @@
 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 @@
 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 @@
 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))
 
 
Modified: python/branches/release31-maint/Lib/lib2to3/fixes/fix_callable.py
==============================================================================
--- python/branches/release31-maint/Lib/lib2to3/fixes/fix_callable.py	(original)
+++ python/branches/release31-maint/Lib/lib2to3/fixes/fix_callable.py	Tue Dec 29 01:44:14 2009
@@ -3,12 +3,12 @@
 
 """Fixer for callable().
 
-This converts callable(obj) into hasattr(obj, '__call__')."""
+This converts callable(obj) into isinstance(obj, collections.Callable), adding a
+collections import if needed."""
 
 # Local imports
-from .. import pytree
-from .. import fixer_base
-from ..fixer_util import Call, Name, String
+from lib2to3 import fixer_base
+from lib2to3.fixer_util import Call, Name, String, Attr, touch_import
 
 class FixCallable(fixer_base.BaseFix):
 
@@ -25,7 +25,10 @@
 """
 
 def transform(self, node, results):
- func = results["func"]
+ func = results['func']
 
- args = [func.clone(), String(', '), String("'__call__'")]
- return Call(Name("hasattr"), args, prefix=node.prefix)
+ touch_import(None, 'collections', node=node)
+
+ args = [func.clone(), String(', ')]
+ args.extend(Attr(Name('collections'), Name('Callable')))
+ return Call(Name('isinstance'), args, prefix=node.prefix)
Modified: python/branches/release31-maint/Lib/lib2to3/main.py
==============================================================================
--- python/branches/release31-maint/Lib/lib2to3/main.py	(original)
+++ python/branches/release31-maint/Lib/lib2to3/main.py	Tue Dec 29 01:44:14 2009
@@ -60,8 +60,14 @@
 else:
 self.log_message("Refactored %s", filename)
 if self.show_diffs:
- for line in diff_texts(old, new, filename):
- print(line)
+ diff_lines = diff_texts(old, new, filename)
+ try:
+ for line in diff_lines:
+ print(line)
+ except UnicodeEncodeError:
+ warn("couldn't encode %s's diff for your terminal" %
+ (filename,))
+ return
 
 def warn(msg):
 print("WARNING: %s" % (msg,), file=sys.stderr)
Modified: python/branches/release31-maint/Lib/lib2to3/tests/test_all_fixers.py
==============================================================================
--- python/branches/release31-maint/Lib/lib2to3/tests/test_all_fixers.py	(original)
+++ python/branches/release31-maint/Lib/lib2to3/tests/test_all_fixers.py	Tue Dec 29 01:44:14 2009
@@ -9,12 +9,12 @@
 import unittest
 
 # Local imports
-from .. import pytree
-from .. import refactor
+from lib2to3 import refactor
 from . import support
 
 
 class Test_all(support.TestCase):
+
 def setUp(self):
 self.refactor = support.get_refactorer()
 
Modified: python/branches/release31-maint/Lib/lib2to3/tests/test_fixers.py
==============================================================================
--- python/branches/release31-maint/Lib/lib2to3/tests/test_fixers.py	(original)
+++ python/branches/release31-maint/Lib/lib2to3/tests/test_fixers.py	Tue Dec 29 01:44:14 2009
@@ -2725,16 +2725,79 @@
 
 def test_prefix_preservation(self):
 b = """callable( x)"""
- a = """hasattr( x, '__call__')"""
+ a = """import collections\nisinstance( x, collections.Callable)"""
 self.check(b, a)
 
 b = """if callable(x): pass"""
- a = """if hasattr(x, '__call__'): pass"""
+ a = """import collections
+if isinstance(x, collections.Callable): pass"""
 self.check(b, a)
 
 def test_callable_call(self):
 b = """callable(x)"""
- a = """hasattr(x, '__call__')"""
+ a = """import collections\nisinstance(x, collections.Callable)"""
+ self.check(b, a)
+
+ def test_global_import(self):
+ b = """
+def spam(foo):
+ callable(foo)"""[1:]
+ a = """
+import collections
+def spam(foo):
+ isinstance(foo, collections.Callable)"""[1:]
+ self.check(b, a)
+
+ b = """
+import collections
+def spam(foo):
+ callable(foo)"""[1:]
+ # same output if it was already imported
+ self.check(b, a)
+
+ b = """
+from collections import *
+def spam(foo):
+ callable(foo)"""[1:]
+ a = """
+from collections import *
+import collections
+def spam(foo):
+ isinstance(foo, collections.Callable)"""[1:]
+ self.check(b, a)
+
+ b = """
+do_stuff()
+do_some_other_stuff()
+assert callable(do_stuff)"""[1:]
+ a = """
+import collections
+do_stuff()
+do_some_other_stuff()
+assert isinstance(do_stuff, collections.Callable)"""[1:]
+ self.check(b, a)
+
+ b = """
+if isinstance(do_stuff, Callable):
+ assert callable(do_stuff)
+ do_stuff(do_stuff)
+ if not callable(do_stuff):
+ exit(1)
+ else:
+ assert callable(do_stuff)
+else:
+ assert not callable(do_stuff)"""[1:]
+ a = """
+import collections
+if isinstance(do_stuff, Callable):
+ assert isinstance(do_stuff, collections.Callable)
+ do_stuff(do_stuff)
+ if not isinstance(do_stuff, collections.Callable):
+ exit(1)
+ else:
+ assert isinstance(do_stuff, collections.Callable)
+else:
+ assert not isinstance(do_stuff, collections.Callable)"""[1:]
 self.check(b, a)
 
 def test_callable_should_not_change(self):
Modified: python/branches/release31-maint/Lib/test/test_lib2to3.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_lib2to3.py	(original)
+++ python/branches/release31-maint/Lib/test/test_lib2to3.py	Tue Dec 29 01:44:14 2009
@@ -1,13 +1,15 @@
 # Skipping test_parser and test_all_fixers
 # because of running
-from lib2to3.tests import test_fixers, test_pytree, test_util, test_refactor
+from lib2to3.tests import (test_fixers, test_pytree, test_util, test_refactor,
+ test_main as test_main_)
 import unittest
 from test.support import run_unittest
 
 def suite():
 tests = unittest.TestSuite()
 loader = unittest.TestLoader()
- for m in (test_fixers,test_pytree,test_util, test_refactor):
+ for m in (test_fixers, test_pytree,test_util, test_refactor,
+ test_main_):
 tests.addTests(loader.loadTestsFromModule(m))
 return tests
 
