| 
									
										
											  
											
												Merged revisions 74114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
  r74114 | benjamin.peterson | 2009-07-20 10:33:09 -0500 (Mon, 20 Jul 2009) | 110 lines
  Merged revisions 73771,73811,73840,73842,73848-73849,73861,73957-73960,73964-73969,73972-73974,73977,73981,73984,74065,74113 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r73771 | benjamin.peterson | 2009-07-02 10:56:55 -0500 (Thu, 02 Jul 2009) | 1 line
    force the imports fixer to be run after the import one #6400
  ........
    r73811 | benjamin.peterson | 2009-07-03 09:03:14 -0500 (Fri, 03 Jul 2009) | 1 line
    check for sep, not pathsep when looking for a subpackage #6408
  ........
    r73840 | benjamin.peterson | 2009-07-04 09:52:28 -0500 (Sat, 04 Jul 2009) | 1 line
    don't print diffs by default; it's annoying
  ........
    r73842 | benjamin.peterson | 2009-07-04 09:58:46 -0500 (Sat, 04 Jul 2009) | 1 line
    complain when not showing diffs or writing
  ........
    r73848 | alexandre.vassalotti | 2009-07-04 23:38:19 -0500 (Sat, 04 Jul 2009) | 2 lines
    Fix test_refactor_stdin to handle print_output() method with 4 arguments.
  ........
    r73849 | alexandre.vassalotti | 2009-07-04 23:43:18 -0500 (Sat, 04 Jul 2009) | 5 lines
    Issue 2370: Add fixer for the removal of operator.isCallable() and
    operator.sequenceIncludes().
    Patch contributed by Jeff Balogh (and updated by me).
  ........
    r73861 | benjamin.peterson | 2009-07-05 09:15:53 -0500 (Sun, 05 Jul 2009) | 1 line
    cleanup and use unicode where appropiate
  ........
    r73957 | benjamin.peterson | 2009-07-11 15:49:56 -0500 (Sat, 11 Jul 2009) | 1 line
    fix calls to str() with unicode()
  ........
    r73958 | benjamin.peterson | 2009-07-11 15:51:51 -0500 (Sat, 11 Jul 2009) | 1 line
    more str() -> unicode()
  ........
    r73959 | benjamin.peterson | 2009-07-11 16:40:08 -0500 (Sat, 11 Jul 2009) | 1 line
    add tests for refactor_dir()
  ........
    r73960 | benjamin.peterson | 2009-07-11 16:44:32 -0500 (Sat, 11 Jul 2009) | 1 line
    don't parse files just because they end with 'py' (no dot)
  ........
    r73964 | benjamin.peterson | 2009-07-11 17:30:15 -0500 (Sat, 11 Jul 2009) | 1 line
    simplify
  ........
    r73965 | benjamin.peterson | 2009-07-11 17:31:30 -0500 (Sat, 11 Jul 2009) | 1 line
    remove usage of get_prefix()
  ........
    r73966 | benjamin.peterson | 2009-07-11 17:33:35 -0500 (Sat, 11 Jul 2009) | 1 line
    revert unintended change in 73965
  ........
    r73967 | benjamin.peterson | 2009-07-11 17:34:44 -0500 (Sat, 11 Jul 2009) | 1 line
    avoid expensive checks and assume the node did change
  ........
    r73968 | benjamin.peterson | 2009-07-11 20:46:46 -0500 (Sat, 11 Jul 2009) | 1 line
    use a regular dict for the heads to avoid adding lists in the loop
  ........
    r73969 | benjamin.peterson | 2009-07-11 20:50:43 -0500 (Sat, 11 Jul 2009) | 1 line
    prefix headnode functions with '_'
  ........
    r73972 | benjamin.peterson | 2009-07-11 21:25:45 -0500 (Sat, 11 Jul 2009) | 1 line
    try to make the head node dict as sparse as possible
  ........
    r73973 | benjamin.peterson | 2009-07-11 21:59:49 -0500 (Sat, 11 Jul 2009) | 1 line
    a better idea; add an option to *not* print diffs
  ........
    r73974 | benjamin.peterson | 2009-07-11 22:00:29 -0500 (Sat, 11 Jul 2009) | 1 line
    add space
  ........
    r73977 | benjamin.peterson | 2009-07-12 10:16:07 -0500 (Sun, 12 Jul 2009) | 1 line
    update get_headnode_dict tests for recent changes
  ........
    r73981 | benjamin.peterson | 2009-07-12 12:06:39 -0500 (Sun, 12 Jul 2009) | 4 lines
    detect when "from __future__ import print_function" is given
    Deprecate the 'print_function' option and the -p flag
  ........
    r73984 | benjamin.peterson | 2009-07-12 16:16:37 -0500 (Sun, 12 Jul 2009) | 1 line
    add tests for Call; thanks Joe Amenta
  ........
    r74065 | benjamin.peterson | 2009-07-17 12:52:49 -0500 (Fri, 17 Jul 2009) | 1 line
    pathname2url and url2pathname are in urllib.request not urllib.parse #6496
  ........
    r74113 | benjamin.peterson | 2009-07-20 08:56:57 -0500 (Mon, 20 Jul 2009) | 1 line
    fix deprecation warnings in tests
  ........
................
											
										 
											2009-07-20 16:42:03 +00:00
										 |  |  | """ Test suite for the code in fixer_util """ | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | # Testing imports | 
					
						
							|  |  |  | from . import support | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | # Python imports | 
					
						
							|  |  |  | import os.path | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | # Local imports | 
					
						
							| 
									
										
											  
											
												Merged revisions 74114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
  r74114 | benjamin.peterson | 2009-07-20 10:33:09 -0500 (Mon, 20 Jul 2009) | 110 lines
  Merged revisions 73771,73811,73840,73842,73848-73849,73861,73957-73960,73964-73969,73972-73974,73977,73981,73984,74065,74113 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r73771 | benjamin.peterson | 2009-07-02 10:56:55 -0500 (Thu, 02 Jul 2009) | 1 line
    force the imports fixer to be run after the import one #6400
  ........
    r73811 | benjamin.peterson | 2009-07-03 09:03:14 -0500 (Fri, 03 Jul 2009) | 1 line
    check for sep, not pathsep when looking for a subpackage #6408
  ........
    r73840 | benjamin.peterson | 2009-07-04 09:52:28 -0500 (Sat, 04 Jul 2009) | 1 line
    don't print diffs by default; it's annoying
  ........
    r73842 | benjamin.peterson | 2009-07-04 09:58:46 -0500 (Sat, 04 Jul 2009) | 1 line
    complain when not showing diffs or writing
  ........
    r73848 | alexandre.vassalotti | 2009-07-04 23:38:19 -0500 (Sat, 04 Jul 2009) | 2 lines
    Fix test_refactor_stdin to handle print_output() method with 4 arguments.
  ........
    r73849 | alexandre.vassalotti | 2009-07-04 23:43:18 -0500 (Sat, 04 Jul 2009) | 5 lines
    Issue 2370: Add fixer for the removal of operator.isCallable() and
    operator.sequenceIncludes().
    Patch contributed by Jeff Balogh (and updated by me).
  ........
    r73861 | benjamin.peterson | 2009-07-05 09:15:53 -0500 (Sun, 05 Jul 2009) | 1 line
    cleanup and use unicode where appropiate
  ........
    r73957 | benjamin.peterson | 2009-07-11 15:49:56 -0500 (Sat, 11 Jul 2009) | 1 line
    fix calls to str() with unicode()
  ........
    r73958 | benjamin.peterson | 2009-07-11 15:51:51 -0500 (Sat, 11 Jul 2009) | 1 line
    more str() -> unicode()
  ........
    r73959 | benjamin.peterson | 2009-07-11 16:40:08 -0500 (Sat, 11 Jul 2009) | 1 line
    add tests for refactor_dir()
  ........
    r73960 | benjamin.peterson | 2009-07-11 16:44:32 -0500 (Sat, 11 Jul 2009) | 1 line
    don't parse files just because they end with 'py' (no dot)
  ........
    r73964 | benjamin.peterson | 2009-07-11 17:30:15 -0500 (Sat, 11 Jul 2009) | 1 line
    simplify
  ........
    r73965 | benjamin.peterson | 2009-07-11 17:31:30 -0500 (Sat, 11 Jul 2009) | 1 line
    remove usage of get_prefix()
  ........
    r73966 | benjamin.peterson | 2009-07-11 17:33:35 -0500 (Sat, 11 Jul 2009) | 1 line
    revert unintended change in 73965
  ........
    r73967 | benjamin.peterson | 2009-07-11 17:34:44 -0500 (Sat, 11 Jul 2009) | 1 line
    avoid expensive checks and assume the node did change
  ........
    r73968 | benjamin.peterson | 2009-07-11 20:46:46 -0500 (Sat, 11 Jul 2009) | 1 line
    use a regular dict for the heads to avoid adding lists in the loop
  ........
    r73969 | benjamin.peterson | 2009-07-11 20:50:43 -0500 (Sat, 11 Jul 2009) | 1 line
    prefix headnode functions with '_'
  ........
    r73972 | benjamin.peterson | 2009-07-11 21:25:45 -0500 (Sat, 11 Jul 2009) | 1 line
    try to make the head node dict as sparse as possible
  ........
    r73973 | benjamin.peterson | 2009-07-11 21:59:49 -0500 (Sat, 11 Jul 2009) | 1 line
    a better idea; add an option to *not* print diffs
  ........
    r73974 | benjamin.peterson | 2009-07-11 22:00:29 -0500 (Sat, 11 Jul 2009) | 1 line
    add space
  ........
    r73977 | benjamin.peterson | 2009-07-12 10:16:07 -0500 (Sun, 12 Jul 2009) | 1 line
    update get_headnode_dict tests for recent changes
  ........
    r73981 | benjamin.peterson | 2009-07-12 12:06:39 -0500 (Sun, 12 Jul 2009) | 4 lines
    detect when "from __future__ import print_function" is given
    Deprecate the 'print_function' option and the -p flag
  ........
    r73984 | benjamin.peterson | 2009-07-12 16:16:37 -0500 (Sun, 12 Jul 2009) | 1 line
    add tests for Call; thanks Joe Amenta
  ........
    r74065 | benjamin.peterson | 2009-07-17 12:52:49 -0500 (Fri, 17 Jul 2009) | 1 line
    pathname2url and url2pathname are in urllib.request not urllib.parse #6496
  ........
    r74113 | benjamin.peterson | 2009-07-20 08:56:57 -0500 (Mon, 20 Jul 2009) | 1 line
    fix deprecation warnings in tests
  ........
................
											
										 
											2009-07-20 16:42:03 +00:00
										 |  |  | from lib2to3.pytree import Node, Leaf | 
					
						
							|  |  |  | from lib2to3 import fixer_util | 
					
						
							|  |  |  | from lib2to3.fixer_util import Attr, Name, Call, Comma | 
					
						
							|  |  |  | from lib2to3.pgen2 import token | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | def parse(code, strip_levels=0): | 
					
						
							|  |  |  |     # The topmost node is file_input, which we don't care about. | 
					
						
							|  |  |  |     # The next-topmost node is a *_stmt node, which we also don't care about | 
					
						
							|  |  |  |     tree = support.parse_string(code) | 
					
						
							|  |  |  |     for i in range(strip_levels): | 
					
						
							|  |  |  |         tree = tree.children[0] | 
					
						
							|  |  |  |     tree.parent = None | 
					
						
							|  |  |  |     return tree | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class MacroTestCase(support.TestCase): | 
					
						
							|  |  |  |     def assertStr(self, node, string): | 
					
						
							|  |  |  |         if isinstance(node, (tuple, list)): | 
					
						
							| 
									
										
											  
											
												Merged revisions 74114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
  r74114 | benjamin.peterson | 2009-07-20 10:33:09 -0500 (Mon, 20 Jul 2009) | 110 lines
  Merged revisions 73771,73811,73840,73842,73848-73849,73861,73957-73960,73964-73969,73972-73974,73977,73981,73984,74065,74113 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r73771 | benjamin.peterson | 2009-07-02 10:56:55 -0500 (Thu, 02 Jul 2009) | 1 line
    force the imports fixer to be run after the import one #6400
  ........
    r73811 | benjamin.peterson | 2009-07-03 09:03:14 -0500 (Fri, 03 Jul 2009) | 1 line
    check for sep, not pathsep when looking for a subpackage #6408
  ........
    r73840 | benjamin.peterson | 2009-07-04 09:52:28 -0500 (Sat, 04 Jul 2009) | 1 line
    don't print diffs by default; it's annoying
  ........
    r73842 | benjamin.peterson | 2009-07-04 09:58:46 -0500 (Sat, 04 Jul 2009) | 1 line
    complain when not showing diffs or writing
  ........
    r73848 | alexandre.vassalotti | 2009-07-04 23:38:19 -0500 (Sat, 04 Jul 2009) | 2 lines
    Fix test_refactor_stdin to handle print_output() method with 4 arguments.
  ........
    r73849 | alexandre.vassalotti | 2009-07-04 23:43:18 -0500 (Sat, 04 Jul 2009) | 5 lines
    Issue 2370: Add fixer for the removal of operator.isCallable() and
    operator.sequenceIncludes().
    Patch contributed by Jeff Balogh (and updated by me).
  ........
    r73861 | benjamin.peterson | 2009-07-05 09:15:53 -0500 (Sun, 05 Jul 2009) | 1 line
    cleanup and use unicode where appropiate
  ........
    r73957 | benjamin.peterson | 2009-07-11 15:49:56 -0500 (Sat, 11 Jul 2009) | 1 line
    fix calls to str() with unicode()
  ........
    r73958 | benjamin.peterson | 2009-07-11 15:51:51 -0500 (Sat, 11 Jul 2009) | 1 line
    more str() -> unicode()
  ........
    r73959 | benjamin.peterson | 2009-07-11 16:40:08 -0500 (Sat, 11 Jul 2009) | 1 line
    add tests for refactor_dir()
  ........
    r73960 | benjamin.peterson | 2009-07-11 16:44:32 -0500 (Sat, 11 Jul 2009) | 1 line
    don't parse files just because they end with 'py' (no dot)
  ........
    r73964 | benjamin.peterson | 2009-07-11 17:30:15 -0500 (Sat, 11 Jul 2009) | 1 line
    simplify
  ........
    r73965 | benjamin.peterson | 2009-07-11 17:31:30 -0500 (Sat, 11 Jul 2009) | 1 line
    remove usage of get_prefix()
  ........
    r73966 | benjamin.peterson | 2009-07-11 17:33:35 -0500 (Sat, 11 Jul 2009) | 1 line
    revert unintended change in 73965
  ........
    r73967 | benjamin.peterson | 2009-07-11 17:34:44 -0500 (Sat, 11 Jul 2009) | 1 line
    avoid expensive checks and assume the node did change
  ........
    r73968 | benjamin.peterson | 2009-07-11 20:46:46 -0500 (Sat, 11 Jul 2009) | 1 line
    use a regular dict for the heads to avoid adding lists in the loop
  ........
    r73969 | benjamin.peterson | 2009-07-11 20:50:43 -0500 (Sat, 11 Jul 2009) | 1 line
    prefix headnode functions with '_'
  ........
    r73972 | benjamin.peterson | 2009-07-11 21:25:45 -0500 (Sat, 11 Jul 2009) | 1 line
    try to make the head node dict as sparse as possible
  ........
    r73973 | benjamin.peterson | 2009-07-11 21:59:49 -0500 (Sat, 11 Jul 2009) | 1 line
    a better idea; add an option to *not* print diffs
  ........
    r73974 | benjamin.peterson | 2009-07-11 22:00:29 -0500 (Sat, 11 Jul 2009) | 1 line
    add space
  ........
    r73977 | benjamin.peterson | 2009-07-12 10:16:07 -0500 (Sun, 12 Jul 2009) | 1 line
    update get_headnode_dict tests for recent changes
  ........
    r73981 | benjamin.peterson | 2009-07-12 12:06:39 -0500 (Sun, 12 Jul 2009) | 4 lines
    detect when "from __future__ import print_function" is given
    Deprecate the 'print_function' option and the -p flag
  ........
    r73984 | benjamin.peterson | 2009-07-12 16:16:37 -0500 (Sun, 12 Jul 2009) | 1 line
    add tests for Call; thanks Joe Amenta
  ........
    r74065 | benjamin.peterson | 2009-07-17 12:52:49 -0500 (Fri, 17 Jul 2009) | 1 line
    pathname2url and url2pathname are in urllib.request not urllib.parse #6496
  ........
    r74113 | benjamin.peterson | 2009-07-20 08:56:57 -0500 (Mon, 20 Jul 2009) | 1 line
    fix deprecation warnings in tests
  ........
................
											
										 
											2009-07-20 16:42:03 +00:00
										 |  |  |             node = Node(fixer_util.syms.simple_stmt, node) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  |         self.assertEqual(str(node), string) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class Test_is_tuple(support.TestCase): | 
					
						
							|  |  |  |     def is_tuple(self, string): | 
					
						
							| 
									
										
											  
											
												Merged revisions 64286 via svnmerge from
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.
  ........
................
											
										 
											2008-06-15 02:57:40 +00:00
										 |  |  |         return fixer_util.is_tuple(parse(string, strip_levels=2)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_valid(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.is_tuple("(a, b)")) | 
					
						
							|  |  |  |         self.assertTrue(self.is_tuple("(a, (b, c))")) | 
					
						
							|  |  |  |         self.assertTrue(self.is_tuple("((a, (b, c)),)")) | 
					
						
							|  |  |  |         self.assertTrue(self.is_tuple("(a,)")) | 
					
						
							|  |  |  |         self.assertTrue(self.is_tuple("()")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_invalid(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.is_tuple("(a)")) | 
					
						
							|  |  |  |         self.assertFalse(self.is_tuple("('foo') % (b, c)")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class Test_is_list(support.TestCase): | 
					
						
							|  |  |  |     def is_list(self, string): | 
					
						
							| 
									
										
											  
											
												Merged revisions 64286 via svnmerge from
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.
  ........
................
											
										 
											2008-06-15 02:57:40 +00:00
										 |  |  |         return fixer_util.is_list(parse(string, strip_levels=2)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_valid(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.is_list("[]")) | 
					
						
							|  |  |  |         self.assertTrue(self.is_list("[a]")) | 
					
						
							|  |  |  |         self.assertTrue(self.is_list("[a, b]")) | 
					
						
							|  |  |  |         self.assertTrue(self.is_list("[a, [b, c]]")) | 
					
						
							|  |  |  |         self.assertTrue(self.is_list("[[a, [b, c]],]")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_invalid(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.is_list("[]+[]")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class Test_Attr(MacroTestCase): | 
					
						
							|  |  |  |     def test(self): | 
					
						
							|  |  |  |         call = parse("foo()", strip_levels=2) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         self.assertStr(Attr(Name("a"), Name("b")), "a.b") | 
					
						
							|  |  |  |         self.assertStr(Attr(call, Name("b")), "foo().b") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_returns(self): | 
					
						
							|  |  |  |         attr = Attr(Name("a"), Name("b")) | 
					
						
							|  |  |  |         self.assertEqual(type(attr), list) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class Test_Name(MacroTestCase): | 
					
						
							|  |  |  |     def test(self): | 
					
						
							|  |  |  |         self.assertStr(Name("a"), "a") | 
					
						
							|  |  |  |         self.assertStr(Name("foo.foo().bar"), "foo.foo().bar") | 
					
						
							|  |  |  |         self.assertStr(Name("a", prefix="b"), "ba") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 74114 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
  r74114 | benjamin.peterson | 2009-07-20 10:33:09 -0500 (Mon, 20 Jul 2009) | 110 lines
  Merged revisions 73771,73811,73840,73842,73848-73849,73861,73957-73960,73964-73969,73972-73974,73977,73981,73984,74065,74113 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r73771 | benjamin.peterson | 2009-07-02 10:56:55 -0500 (Thu, 02 Jul 2009) | 1 line
    force the imports fixer to be run after the import one #6400
  ........
    r73811 | benjamin.peterson | 2009-07-03 09:03:14 -0500 (Fri, 03 Jul 2009) | 1 line
    check for sep, not pathsep when looking for a subpackage #6408
  ........
    r73840 | benjamin.peterson | 2009-07-04 09:52:28 -0500 (Sat, 04 Jul 2009) | 1 line
    don't print diffs by default; it's annoying
  ........
    r73842 | benjamin.peterson | 2009-07-04 09:58:46 -0500 (Sat, 04 Jul 2009) | 1 line
    complain when not showing diffs or writing
  ........
    r73848 | alexandre.vassalotti | 2009-07-04 23:38:19 -0500 (Sat, 04 Jul 2009) | 2 lines
    Fix test_refactor_stdin to handle print_output() method with 4 arguments.
  ........
    r73849 | alexandre.vassalotti | 2009-07-04 23:43:18 -0500 (Sat, 04 Jul 2009) | 5 lines
    Issue 2370: Add fixer for the removal of operator.isCallable() and
    operator.sequenceIncludes().
    Patch contributed by Jeff Balogh (and updated by me).
  ........
    r73861 | benjamin.peterson | 2009-07-05 09:15:53 -0500 (Sun, 05 Jul 2009) | 1 line
    cleanup and use unicode where appropiate
  ........
    r73957 | benjamin.peterson | 2009-07-11 15:49:56 -0500 (Sat, 11 Jul 2009) | 1 line
    fix calls to str() with unicode()
  ........
    r73958 | benjamin.peterson | 2009-07-11 15:51:51 -0500 (Sat, 11 Jul 2009) | 1 line
    more str() -> unicode()
  ........
    r73959 | benjamin.peterson | 2009-07-11 16:40:08 -0500 (Sat, 11 Jul 2009) | 1 line
    add tests for refactor_dir()
  ........
    r73960 | benjamin.peterson | 2009-07-11 16:44:32 -0500 (Sat, 11 Jul 2009) | 1 line
    don't parse files just because they end with 'py' (no dot)
  ........
    r73964 | benjamin.peterson | 2009-07-11 17:30:15 -0500 (Sat, 11 Jul 2009) | 1 line
    simplify
  ........
    r73965 | benjamin.peterson | 2009-07-11 17:31:30 -0500 (Sat, 11 Jul 2009) | 1 line
    remove usage of get_prefix()
  ........
    r73966 | benjamin.peterson | 2009-07-11 17:33:35 -0500 (Sat, 11 Jul 2009) | 1 line
    revert unintended change in 73965
  ........
    r73967 | benjamin.peterson | 2009-07-11 17:34:44 -0500 (Sat, 11 Jul 2009) | 1 line
    avoid expensive checks and assume the node did change
  ........
    r73968 | benjamin.peterson | 2009-07-11 20:46:46 -0500 (Sat, 11 Jul 2009) | 1 line
    use a regular dict for the heads to avoid adding lists in the loop
  ........
    r73969 | benjamin.peterson | 2009-07-11 20:50:43 -0500 (Sat, 11 Jul 2009) | 1 line
    prefix headnode functions with '_'
  ........
    r73972 | benjamin.peterson | 2009-07-11 21:25:45 -0500 (Sat, 11 Jul 2009) | 1 line
    try to make the head node dict as sparse as possible
  ........
    r73973 | benjamin.peterson | 2009-07-11 21:59:49 -0500 (Sat, 11 Jul 2009) | 1 line
    a better idea; add an option to *not* print diffs
  ........
    r73974 | benjamin.peterson | 2009-07-11 22:00:29 -0500 (Sat, 11 Jul 2009) | 1 line
    add space
  ........
    r73977 | benjamin.peterson | 2009-07-12 10:16:07 -0500 (Sun, 12 Jul 2009) | 1 line
    update get_headnode_dict tests for recent changes
  ........
    r73981 | benjamin.peterson | 2009-07-12 12:06:39 -0500 (Sun, 12 Jul 2009) | 4 lines
    detect when "from __future__ import print_function" is given
    Deprecate the 'print_function' option and the -p flag
  ........
    r73984 | benjamin.peterson | 2009-07-12 16:16:37 -0500 (Sun, 12 Jul 2009) | 1 line
    add tests for Call; thanks Joe Amenta
  ........
    r74065 | benjamin.peterson | 2009-07-17 12:52:49 -0500 (Fri, 17 Jul 2009) | 1 line
    pathname2url and url2pathname are in urllib.request not urllib.parse #6496
  ........
    r74113 | benjamin.peterson | 2009-07-20 08:56:57 -0500 (Mon, 20 Jul 2009) | 1 line
    fix deprecation warnings in tests
  ........
................
											
										 
											2009-07-20 16:42:03 +00:00
										 |  |  | class Test_Call(MacroTestCase): | 
					
						
							|  |  |  |     def _Call(self, name, args=None, prefix=None): | 
					
						
							|  |  |  |         """Help the next test""" | 
					
						
							|  |  |  |         children = [] | 
					
						
							|  |  |  |         if isinstance(args, list): | 
					
						
							|  |  |  |             for arg in args: | 
					
						
							|  |  |  |                 children.append(arg) | 
					
						
							|  |  |  |                 children.append(Comma()) | 
					
						
							|  |  |  |             children.pop() | 
					
						
							|  |  |  |         return Call(Name(name), children, prefix) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test(self): | 
					
						
							|  |  |  |         kids = [None, | 
					
						
							|  |  |  |                 [Leaf(token.NUMBER, 1), Leaf(token.NUMBER, 2), | 
					
						
							|  |  |  |                  Leaf(token.NUMBER, 3)], | 
					
						
							|  |  |  |                 [Leaf(token.NUMBER, 1), Leaf(token.NUMBER, 3), | 
					
						
							|  |  |  |                  Leaf(token.NUMBER, 2), Leaf(token.NUMBER, 4)], | 
					
						
							|  |  |  |                 [Leaf(token.STRING, "b"), Leaf(token.STRING, "j", prefix=" ")] | 
					
						
							|  |  |  |                 ] | 
					
						
							|  |  |  |         self.assertStr(self._Call("A"), "A()") | 
					
						
							|  |  |  |         self.assertStr(self._Call("b", kids[1]), "b(1,2,3)") | 
					
						
							|  |  |  |         self.assertStr(self._Call("a.b().c", kids[2]), "a.b().c(1,3,2,4)") | 
					
						
							|  |  |  |         self.assertStr(self._Call("d", kids[3], prefix=" "), " d(b, j)") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | class Test_does_tree_import(support.TestCase): | 
					
						
							|  |  |  |     def _find_bind_rec(self, name, node): | 
					
						
							|  |  |  |         # Search a tree for a binding -- used to find the starting | 
					
						
							|  |  |  |         # point for these tests. | 
					
						
							| 
									
										
											  
											
												Merged revisions 64286 via svnmerge from
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.
  ........
................
											
										 
											2008-06-15 02:57:40 +00:00
										 |  |  |         c = fixer_util.find_binding(name, node) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  |         if c: return c | 
					
						
							|  |  |  |         for child in node.children: | 
					
						
							|  |  |  |             c = self._find_bind_rec(name, child) | 
					
						
							|  |  |  |             if c: return c | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def does_tree_import(self, package, name, string): | 
					
						
							|  |  |  |         node = parse(string) | 
					
						
							|  |  |  |         # Find the binding of start -- that's what we'll go from | 
					
						
							|  |  |  |         node = self._find_bind_rec('start', node) | 
					
						
							| 
									
										
											  
											
												Merged revisions 64286 via svnmerge from
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.
  ........
................
											
										 
											2008-06-15 02:57:40 +00:00
										 |  |  |         return fixer_util.does_tree_import(package, name, node) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def try_with(self, string): | 
					
						
							|  |  |  |         failing_tests = (("a", "a", "from a import b"), | 
					
						
							|  |  |  |                          ("a.d", "a", "from a.d import b"), | 
					
						
							|  |  |  |                          ("d.a", "a", "from d.a import b"), | 
					
						
							|  |  |  |                          (None, "a", "import b"), | 
					
						
							|  |  |  |                          (None, "a", "import b, c, d")) | 
					
						
							|  |  |  |         for package, name, import_ in failing_tests: | 
					
						
							|  |  |  |             n = self.does_tree_import(package, name, import_ + "\n" + string) | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |             self.assertFalse(n) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  |             n = self.does_tree_import(package, name, string + "\n" + import_) | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |             self.assertFalse(n) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         passing_tests = (("a", "a", "from a import a"), | 
					
						
							|  |  |  |                          ("x", "a", "from x import a"), | 
					
						
							|  |  |  |                          ("x", "a", "from x import b, c, a, d"), | 
					
						
							|  |  |  |                          ("x.b", "a", "from x.b import a"), | 
					
						
							|  |  |  |                          ("x.b", "a", "from x.b import b, c, a, d"), | 
					
						
							|  |  |  |                          (None, "a", "import a"), | 
					
						
							|  |  |  |                          (None, "a", "import b, c, a, d")) | 
					
						
							|  |  |  |         for package, name, import_ in passing_tests: | 
					
						
							|  |  |  |             n = self.does_tree_import(package, name, import_ + "\n" + string) | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |             self.assertTrue(n) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  |             n = self.does_tree_import(package, name, string + "\n" + import_) | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |             self.assertTrue(n) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_in_function(self): | 
					
						
							|  |  |  |         self.try_with("def foo():\n\tbar.baz()\n\tstart=3") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | class Test_find_binding(support.TestCase): | 
					
						
							|  |  |  |     def find_binding(self, name, string, package=None): | 
					
						
							| 
									
										
											  
											
												Merged revisions 64286 via svnmerge from
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.
  ........
................
											
										 
											2008-06-15 02:57:40 +00:00
										 |  |  |         return fixer_util.find_binding(name, parse(string), package) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_simple_assignment(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "a = b")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "a = [b, c, d]")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "a = foo()")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "a = foo().foo.foo[6][foo]")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "foo = a")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "foo = (a, b, c)")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_tuple_assignment(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "(a,) = b")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "(a, b, c) = [b, c, d]")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "(c, (d, a), b) = foo()")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "(a, b) = foo().foo[6][foo]")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "(foo, b) = (b, a)")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "(foo, (b, c)) = (a, b, c)")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_list_assignment(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "[a] = b")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "[a, b, c] = [b, c, d]")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "[c, [d, a], b] = foo()")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "[a, b] = foo().foo[a][foo]")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "[foo, b] = (b, a)")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "[foo, [b, c]] = (a, b, c)")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_invalid_assignments(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", "foo.a = 5")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "foo[a] = 5")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "foo(a) = 5")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "foo(a, b) = 5")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_simple_import(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "import a")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "import b, c, a, d")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "import b")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "import b, c, d")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_from_import(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "from x import a")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from a import a")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x import b, c, a, d")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x.b import a")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x.b import b, c, a, d")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from a import b")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from a.d import b")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from d.a import b")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_import_as(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "import b as a")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "import b as a, c, a as f, d")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "import a as f")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "import b, c as f, d as e")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_from_import_as(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "from x import b as a")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x import g as a, d as b")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x.b import t as a")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x.b import g as a, d")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from a import b as t")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from a.d import b as t")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from d.a import b as t")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_simple_import_with_package(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("b", "import b")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("b", "import b, c, d")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("b", "import b", "b")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("b", "import b, c, d", "c")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_from_import_with_package(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "from x import a", "x")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from a import a", "a")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x import *", "x")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x import b, c, a, d", "x")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x.b import a", "x.b")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x.b import *", "x.b")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "from x.b import b, c, a, d", "x.b")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from a import b", "a")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from a.d import b", "a.d")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from d.a import b", "a.d")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from x.y import *", "a.b")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_import_as_with_package(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", "import b.c as a", "b.c")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "import a as f", "f")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "import a as f", "a")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_from_import_as_with_package(self): | 
					
						
							|  |  |  |         # Because it would take a lot of special-case code in the fixers | 
					
						
							|  |  |  |         # to deal with from foo import bar as baz, we'll simply always | 
					
						
							|  |  |  |         # fail if there is an "from ... import ... as ..." | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", "from x import b as a", "x")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from x import g as a, d as b", "x")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from x.b import t as a", "x.b")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from x.b import g as a, d", "x.b")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from a import b as t", "a")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from a import b as t", "b")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "from a import b as t", "t")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_function_def(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "def a(): pass")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "def a(b, c, d): pass")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "def a(): b = 7")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "def d(b, (c, a), e): pass")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "def d(a=7): pass")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "def d(a): pass")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "def d(): a = 7")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             def d(): | 
					
						
							|  |  |  |                 def a(): | 
					
						
							|  |  |  |                     pass"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_class_def(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "class a: pass")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "class a(): pass")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "class a(b): pass")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "class a(b, c=8): pass")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "class d: pass")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "class d(a): pass")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "class d(b, a=7): pass")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "class d(b, *a): pass")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "class d(b, **a): pass")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "class d: a = 7")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             class d(): | 
					
						
							|  |  |  |                 class a(): | 
					
						
							|  |  |  |                     pass"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_for(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "for a in r: pass")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "for a, b in r: pass")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "for (a, b) in r: pass")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "for c, (a,) in r: pass")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "for c, (a, b) in r: pass")) | 
					
						
							|  |  |  |         self.assertTrue(self.find_binding("a", "for c in r: a = c")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "for c in a: pass")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_for_nested(self): | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             for b in r: | 
					
						
							|  |  |  |                 for a in b: | 
					
						
							|  |  |  |                     pass"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             for b in r: | 
					
						
							|  |  |  |                 for a, c in b: | 
					
						
							|  |  |  |                     pass"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             for b in r: | 
					
						
							|  |  |  |                 for (a, c) in b: | 
					
						
							|  |  |  |                     pass"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             for b in r: | 
					
						
							|  |  |  |                 for (a,) in b: | 
					
						
							|  |  |  |                     pass"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             for b in r: | 
					
						
							|  |  |  |                 for c, (a, d) in b: | 
					
						
							|  |  |  |                     pass"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             for b in r: | 
					
						
							|  |  |  |                 for c in b: | 
					
						
							|  |  |  |                     a = 7"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             for b in r: | 
					
						
							|  |  |  |                 for c in b: | 
					
						
							|  |  |  |                     d = a"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             for b in r: | 
					
						
							|  |  |  |                 for c in a: | 
					
						
							|  |  |  |                     d = 7"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_if(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "if b in r: a = c")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "if a in r: d = e")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_if_nested(self): | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             if b in r: | 
					
						
							|  |  |  |                 if c in d: | 
					
						
							|  |  |  |                     a = c"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             if b in r: | 
					
						
							|  |  |  |                 if c in d: | 
					
						
							|  |  |  |                     c = a"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_while(self): | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", "while b in r: a = c")) | 
					
						
							|  |  |  |         self.assertFalse(self.find_binding("a", "while a in r: d = e")) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_while_nested(self): | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             while b in r: | 
					
						
							|  |  |  |                 while c in d: | 
					
						
							|  |  |  |                     a = c"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             while b in r: | 
					
						
							|  |  |  |                 while c in d: | 
					
						
							|  |  |  |                     c = a"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_try_except(self): | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 a = 6 | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 b = 8"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 a = 6"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             except KeyError: | 
					
						
							|  |  |  |                 pass | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 a = 6"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 b = 6"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_try_except_nested(self): | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     a = 6 | 
					
						
							|  |  |  |                 except: | 
					
						
							|  |  |  |                     pass | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 b = 8"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     a = 6 | 
					
						
							|  |  |  |                 except: | 
					
						
							|  |  |  |                     pass"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     pass | 
					
						
							|  |  |  |                 except: | 
					
						
							|  |  |  |                     a = 6"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     b = 8 | 
					
						
							|  |  |  |                 except KeyError: | 
					
						
							|  |  |  |                     pass | 
					
						
							|  |  |  |                 except: | 
					
						
							|  |  |  |                     a = 6 | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 pass"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 pass | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     b = 8 | 
					
						
							|  |  |  |                 except KeyError: | 
					
						
							|  |  |  |                     pass | 
					
						
							|  |  |  |                 except: | 
					
						
							|  |  |  |                     a = 6"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 b = 6"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     b = 8 | 
					
						
							|  |  |  |                 except: | 
					
						
							|  |  |  |                     c = d | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     b = 6 | 
					
						
							|  |  |  |                 except: | 
					
						
							|  |  |  |                     t = 8 | 
					
						
							|  |  |  |                 except: | 
					
						
							|  |  |  |                     o = y"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_try_except_finally(self): | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 c = 6 | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             finally: | 
					
						
							|  |  |  |                 a = 9"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             finally: | 
					
						
							|  |  |  |                 a = 6"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             finally: | 
					
						
							|  |  |  |                 b = 6"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 b = 9 | 
					
						
							|  |  |  |             finally: | 
					
						
							|  |  |  |                 b = 6"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_try_except_finally_nested(self): | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 c = 6 | 
					
						
							|  |  |  |             except: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             finally: | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     a = 9 | 
					
						
							|  |  |  |                 except: | 
					
						
							|  |  |  |                     b = 9 | 
					
						
							|  |  |  |                 finally: | 
					
						
							|  |  |  |                     c = 9"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             finally: | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     pass | 
					
						
							|  |  |  |                 finally: | 
					
						
							|  |  |  |                     a = 6"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertTrue(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |         s = """
 | 
					
						
							|  |  |  |             try: | 
					
						
							|  |  |  |                 b = 8 | 
					
						
							|  |  |  |             finally: | 
					
						
							|  |  |  |                 try: | 
					
						
							|  |  |  |                     b = 6 | 
					
						
							|  |  |  |                 finally: | 
					
						
							|  |  |  |                     b = 7"""
 | 
					
						
							| 
									
										
										
										
											2009-07-01 01:06:56 +00:00
										 |  |  |         self.assertFalse(self.find_binding("a", s)) | 
					
						
							| 
									
										
										
										
											2008-03-19 05:04:44 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 67806 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
  r67806 | benjamin.peterson | 2008-12-15 21:35:28 -0600 (Mon, 15 Dec 2008) | 111 lines
  Merged revisions 67427,67431,67433,67435,67630,67652,67656-67657,67674-67675,67678-67679,67705-67706,67716,67723,67765-67771,67774,67776,67778 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r67427 | benjamin.peterson | 2008-11-28 16:07:41 -0600 (Fri, 28 Nov 2008) | 1 line
    fix spelling in comment
  ........
    r67431 | benjamin.peterson | 2008-11-28 17:14:08 -0600 (Fri, 28 Nov 2008) | 1 line
    add a scripts directory; move things to it
  ........
    r67433 | benjamin.peterson | 2008-11-28 17:18:48 -0600 (Fri, 28 Nov 2008) | 1 line
    run svneol.py
  ........
    r67435 | benjamin.peterson | 2008-11-28 17:25:03 -0600 (Fri, 28 Nov 2008) | 1 line
    rename pre/post_order_mapping to pre/post_order_heads
  ........
    r67630 | alexandre.vassalotti | 2008-12-06 21:51:56 -0600 (Sat, 06 Dec 2008) | 2 lines
    Fix typo in the urllib2.HTTPDigestAuthHandler fixer.
  ........
    r67652 | armin.ronacher | 2008-12-07 15:39:43 -0600 (Sun, 07 Dec 2008) | 5 lines
    Added a fixer that cleans up a tuple argument to isinstance after the tokens
    in it were fixed.  This is mainly used to remove double occurrences of
    tokens as a leftover of the long -> int / unicode -> str conversion.
  ........
    r67656 | armin.ronacher | 2008-12-07 16:54:16 -0600 (Sun, 07 Dec 2008) | 3 lines
    Added missing copyright fo 2to3 fix_isinstance.
  ........
    r67657 | armin.ronacher | 2008-12-07 18:29:35 -0600 (Sun, 07 Dec 2008) | 3 lines
    2to3: intern and reduce fixes now add the imports if missing.  Because that is a common task the fixer_util module now has a function "touch_import" that adds imports if missing.
  ........
    r67674 | benjamin.peterson | 2008-12-08 19:58:11 -0600 (Mon, 08 Dec 2008) | 1 line
    copy permission bits when making backup files #4602
  ........
    r67675 | benjamin.peterson | 2008-12-08 19:59:11 -0600 (Mon, 08 Dec 2008) | 1 line
    add forgotten import
  ........
    r67678 | benjamin.peterson | 2008-12-08 20:08:30 -0600 (Mon, 08 Dec 2008) | 1 line
    fix #4602 for real
  ........
    r67679 | armin.ronacher | 2008-12-09 00:54:03 -0600 (Tue, 09 Dec 2008) | 3 lines
    Removed redudant code from the 2to3 long fixer.  This fixes #4590.
  ........
    r67705 | benjamin.peterson | 2008-12-11 13:04:08 -0600 (Thu, 11 Dec 2008) | 1 line
    put trailers after a range call after the list()
  ........
    r67706 | benjamin.peterson | 2008-12-11 13:17:57 -0600 (Thu, 11 Dec 2008) | 1 line
    add html related modules to the fix_imports mapping
  ........
    r67716 | benjamin.peterson | 2008-12-11 22:16:47 -0600 (Thu, 11 Dec 2008) | 1 line
    consolidate tests
  ........
    r67723 | benjamin.peterson | 2008-12-12 19:49:31 -0600 (Fri, 12 Dec 2008) | 1 line
    fix name
  ........
    r67765 | benjamin.peterson | 2008-12-14 14:05:05 -0600 (Sun, 14 Dec 2008) | 1 line
    run fix_isinstance after fix_long and fix_unicode
  ........
    r67766 | benjamin.peterson | 2008-12-14 14:13:05 -0600 (Sun, 14 Dec 2008) | 1 line
    use run_order instead of order
  ........
    r67767 | benjamin.peterson | 2008-12-14 14:28:12 -0600 (Sun, 14 Dec 2008) | 1 line
    don't retain parenthesis if there is only one item left
  ........
    r67768 | benjamin.peterson | 2008-12-14 14:32:30 -0600 (Sun, 14 Dec 2008) | 1 line
    use insert_child()
  ........
    r67769 | benjamin.peterson | 2008-12-14 14:59:10 -0600 (Sun, 14 Dec 2008) | 1 line
    parenthesize doesn't belong in pygram or FixerBase
  ........
    r67770 | alexandre.vassalotti | 2008-12-14 15:15:36 -0600 (Sun, 14 Dec 2008) | 2 lines
    Fix typo: html.paser -> html.parser.
  ........
    r67771 | benjamin.peterson | 2008-12-14 15:22:09 -0600 (Sun, 14 Dec 2008) | 1 line
    altering .children needs to call changed()
  ........
    r67774 | benjamin.peterson | 2008-12-14 15:55:38 -0600 (Sun, 14 Dec 2008) | 1 line
    employ an evil hack to fix multiple names in the same import statement
  ........
    r67776 | benjamin.peterson | 2008-12-14 16:22:38 -0600 (Sun, 14 Dec 2008) | 1 line
    make a common mixin class for Test_imports and friends
  ........
    r67778 | alexandre.vassalotti | 2008-12-14 17:48:20 -0600 (Sun, 14 Dec 2008) | 2 lines
    Make fix_imports refactor multiple imports as.
  ........
................
											
										 
											2008-12-16 03:57:54 +00:00
										 |  |  | class Test_touch_import(support.TestCase): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_after_docstring(self): | 
					
						
							|  |  |  |         node = parse('"""foo"""\nbar()') | 
					
						
							|  |  |  |         fixer_util.touch_import(None, "foo", node) | 
					
						
							|  |  |  |         self.assertEqual(str(node), '"""foo"""\nimport foo\nbar()\n\n') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_after_imports(self): | 
					
						
							|  |  |  |         node = parse('"""foo"""\nimport bar\nbar()') | 
					
						
							|  |  |  |         fixer_util.touch_import(None, "foo", node) | 
					
						
							|  |  |  |         self.assertEqual(str(node), '"""foo"""\nimport bar\nimport foo\nbar()\n\n') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_beginning(self): | 
					
						
							|  |  |  |         node = parse('bar()') | 
					
						
							|  |  |  |         fixer_util.touch_import(None, "foo", node) | 
					
						
							|  |  |  |         self.assertEqual(str(node), 'import foo\nbar()\n\n') | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_from_import(self): | 
					
						
							|  |  |  |         node = parse('bar()') | 
					
						
							| 
									
										
										
										
											2010-12-03 23:11:07 +00:00
										 |  |  |         fixer_util.touch_import("html", "escape", node) | 
					
						
							|  |  |  |         self.assertEqual(str(node), 'from html import escape\nbar()\n\n') | 
					
						
							| 
									
										
											  
											
												Merged revisions 67806 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
  r67806 | benjamin.peterson | 2008-12-15 21:35:28 -0600 (Mon, 15 Dec 2008) | 111 lines
  Merged revisions 67427,67431,67433,67435,67630,67652,67656-67657,67674-67675,67678-67679,67705-67706,67716,67723,67765-67771,67774,67776,67778 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r67427 | benjamin.peterson | 2008-11-28 16:07:41 -0600 (Fri, 28 Nov 2008) | 1 line
    fix spelling in comment
  ........
    r67431 | benjamin.peterson | 2008-11-28 17:14:08 -0600 (Fri, 28 Nov 2008) | 1 line
    add a scripts directory; move things to it
  ........
    r67433 | benjamin.peterson | 2008-11-28 17:18:48 -0600 (Fri, 28 Nov 2008) | 1 line
    run svneol.py
  ........
    r67435 | benjamin.peterson | 2008-11-28 17:25:03 -0600 (Fri, 28 Nov 2008) | 1 line
    rename pre/post_order_mapping to pre/post_order_heads
  ........
    r67630 | alexandre.vassalotti | 2008-12-06 21:51:56 -0600 (Sat, 06 Dec 2008) | 2 lines
    Fix typo in the urllib2.HTTPDigestAuthHandler fixer.
  ........
    r67652 | armin.ronacher | 2008-12-07 15:39:43 -0600 (Sun, 07 Dec 2008) | 5 lines
    Added a fixer that cleans up a tuple argument to isinstance after the tokens
    in it were fixed.  This is mainly used to remove double occurrences of
    tokens as a leftover of the long -> int / unicode -> str conversion.
  ........
    r67656 | armin.ronacher | 2008-12-07 16:54:16 -0600 (Sun, 07 Dec 2008) | 3 lines
    Added missing copyright fo 2to3 fix_isinstance.
  ........
    r67657 | armin.ronacher | 2008-12-07 18:29:35 -0600 (Sun, 07 Dec 2008) | 3 lines
    2to3: intern and reduce fixes now add the imports if missing.  Because that is a common task the fixer_util module now has a function "touch_import" that adds imports if missing.
  ........
    r67674 | benjamin.peterson | 2008-12-08 19:58:11 -0600 (Mon, 08 Dec 2008) | 1 line
    copy permission bits when making backup files #4602
  ........
    r67675 | benjamin.peterson | 2008-12-08 19:59:11 -0600 (Mon, 08 Dec 2008) | 1 line
    add forgotten import
  ........
    r67678 | benjamin.peterson | 2008-12-08 20:08:30 -0600 (Mon, 08 Dec 2008) | 1 line
    fix #4602 for real
  ........
    r67679 | armin.ronacher | 2008-12-09 00:54:03 -0600 (Tue, 09 Dec 2008) | 3 lines
    Removed redudant code from the 2to3 long fixer.  This fixes #4590.
  ........
    r67705 | benjamin.peterson | 2008-12-11 13:04:08 -0600 (Thu, 11 Dec 2008) | 1 line
    put trailers after a range call after the list()
  ........
    r67706 | benjamin.peterson | 2008-12-11 13:17:57 -0600 (Thu, 11 Dec 2008) | 1 line
    add html related modules to the fix_imports mapping
  ........
    r67716 | benjamin.peterson | 2008-12-11 22:16:47 -0600 (Thu, 11 Dec 2008) | 1 line
    consolidate tests
  ........
    r67723 | benjamin.peterson | 2008-12-12 19:49:31 -0600 (Fri, 12 Dec 2008) | 1 line
    fix name
  ........
    r67765 | benjamin.peterson | 2008-12-14 14:05:05 -0600 (Sun, 14 Dec 2008) | 1 line
    run fix_isinstance after fix_long and fix_unicode
  ........
    r67766 | benjamin.peterson | 2008-12-14 14:13:05 -0600 (Sun, 14 Dec 2008) | 1 line
    use run_order instead of order
  ........
    r67767 | benjamin.peterson | 2008-12-14 14:28:12 -0600 (Sun, 14 Dec 2008) | 1 line
    don't retain parenthesis if there is only one item left
  ........
    r67768 | benjamin.peterson | 2008-12-14 14:32:30 -0600 (Sun, 14 Dec 2008) | 1 line
    use insert_child()
  ........
    r67769 | benjamin.peterson | 2008-12-14 14:59:10 -0600 (Sun, 14 Dec 2008) | 1 line
    parenthesize doesn't belong in pygram or FixerBase
  ........
    r67770 | alexandre.vassalotti | 2008-12-14 15:15:36 -0600 (Sun, 14 Dec 2008) | 2 lines
    Fix typo: html.paser -> html.parser.
  ........
    r67771 | benjamin.peterson | 2008-12-14 15:22:09 -0600 (Sun, 14 Dec 2008) | 1 line
    altering .children needs to call changed()
  ........
    r67774 | benjamin.peterson | 2008-12-14 15:55:38 -0600 (Sun, 14 Dec 2008) | 1 line
    employ an evil hack to fix multiple names in the same import statement
  ........
    r67776 | benjamin.peterson | 2008-12-14 16:22:38 -0600 (Sun, 14 Dec 2008) | 1 line
    make a common mixin class for Test_imports and friends
  ........
    r67778 | alexandre.vassalotti | 2008-12-14 17:48:20 -0600 (Sun, 14 Dec 2008) | 2 lines
    Make fix_imports refactor multiple imports as.
  ........
................
											
										 
											2008-12-16 03:57:54 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def test_name_import(self): | 
					
						
							|  |  |  |         node = parse('bar()') | 
					
						
							|  |  |  |         fixer_util.touch_import(None, "cgi", node) | 
					
						
							|  |  |  |         self.assertEqual(str(node), 'import cgi\nbar()\n\n') | 
					
						
							| 
									
										
											  
											
												Merged revisions 82779,82855,83740,83789-83791,83797-83801,83803,83811,83827,83844 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
  r82779 | benjamin.peterson | 2010-07-10 14:45:08 -0500 (Sat, 10 Jul 2010) | 1 line
  typo in attribute name #9217
........
  r82855 | benjamin.peterson | 2010-07-13 16:27:38 -0500 (Tue, 13 Jul 2010) | 1 line
  remove more extraneous commas #9245
........
  r83740 | alexandre.vassalotti | 2010-08-05 01:58:36 -0500 (Thu, 05 Aug 2010) | 4 lines
  Issue 5077: Update fixer for the other functions gone from the operator module.
  Patch by Meador Inge.
........
  r83789 | benjamin.peterson | 2010-08-07 17:45:14 -0500 (Sat, 07 Aug 2010) | 1 line
  cleanup and use unicode consistently
........
  r83790 | benjamin.peterson | 2010-08-07 17:52:06 -0500 (Sat, 07 Aug 2010) | 1 line
  unicode literal
........
  r83791 | benjamin.peterson | 2010-08-07 17:52:55 -0500 (Sat, 07 Aug 2010) | 1 line
  .get() is pointless here
........
  r83797 | benjamin.peterson | 2010-08-07 18:54:51 -0500 (Sat, 07 Aug 2010) | 1 line
  add a function to find how a node is indented
........
  r83798 | benjamin.peterson | 2010-08-07 18:55:28 -0500 (Sat, 07 Aug 2010) | 1 line
  when splitting import statements, use correct indentation #9386
........
  r83799 | benjamin.peterson | 2010-08-07 18:57:43 -0500 (Sat, 07 Aug 2010) | 1 line
  double quotes
........
  r83800 | benjamin.peterson | 2010-08-07 18:58:52 -0500 (Sat, 07 Aug 2010) | 1 line
  add another test
........
  r83801 | benjamin.peterson | 2010-08-07 19:02:10 -0500 (Sat, 07 Aug 2010) | 1 line
  cleanup; style-nits
........
  r83803 | benjamin.peterson | 2010-08-07 19:05:08 -0500 (Sat, 07 Aug 2010) | 1 line
  slightly more explicit
........
  r83811 | benjamin.peterson | 2010-08-07 22:56:44 -0500 (Sat, 07 Aug 2010) | 4 lines
  Fix node.pre_order() to call the right method on its children.
  This was a rather tragic copy-paste error.
........
  r83827 | benjamin.peterson | 2010-08-08 08:12:48 -0500 (Sun, 08 Aug 2010) | 1 line
  cause test to actually run and fix it
........
  r83844 | benjamin.peterson | 2010-08-08 13:46:37 -0500 (Sun, 08 Aug 2010) | 1 line
  fix whitespace
........
											
										 
											2010-08-08 19:01:25 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | class Test_find_indentation(support.TestCase): | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_nothing(self): | 
					
						
							|  |  |  |         fi = fixer_util.find_indentation | 
					
						
							|  |  |  |         node = parse("node()") | 
					
						
							|  |  |  |         self.assertEqual(fi(node), "") | 
					
						
							|  |  |  |         node = parse("") | 
					
						
							|  |  |  |         self.assertEqual(fi(node), "") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def test_simple(self): | 
					
						
							|  |  |  |         fi = fixer_util.find_indentation | 
					
						
							|  |  |  |         node = parse("def f():\n    x()") | 
					
						
							|  |  |  |         self.assertEqual(fi(node), "") | 
					
						
							|  |  |  |         self.assertEqual(fi(node.children[0].children[4].children[2]), "    ") | 
					
						
							|  |  |  |         node = parse("def f():\n    x()\n    y()") | 
					
						
							|  |  |  |         self.assertEqual(fi(node.children[0].children[4].children[4]), "    ") |