cpython

Commit Graph

Author	SHA1	Message	Date
Benjamin Peterson	f37eb3a184	Merged revisions 83852-83853,83857,84042,84216,84274-84276,84375,85388,85478,85506-85508 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r83852 \| benjamin.peterson \| 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) \| 1 line wrap with parens ........ r83853 \| benjamin.peterson \| 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) \| 1 line use parens ........ r83857 \| benjamin.peterson \| 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) \| 1 line things which use touch_import should be pre order ........ r84042 \| george.boutsioukis \| 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) \| 2 lines This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers. ........ r84216 \| benjamin.peterson \| 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) \| 1 line allow star_expr in testlist_gexp ........ r84274 \| benjamin.peterson \| 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) \| 1 line wrap long line ........ r84275 \| benjamin.peterson \| 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) \| 1 line cleanup ........ r84276 \| benjamin.peterson \| 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) \| 1 line when there's a None value and a traceback, don't call type with it #9661 ........ r84375 \| george.boutsioukis \| 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) \| 3 lines Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code. ........ r85388 \| benjamin.peterson \| 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) \| 1 line fix urllib fixer with multiple as imports on a line #10069 ........ r85478 \| benjamin.peterson \| 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) \| 1 line stop abusing docstrings ........ r85506 \| benjamin.peterson \| 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) \| 1 line kill sibling import ........ r85507 \| benjamin.peterson \| 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) \| 1 line remove trailing whitespace ........ r85508 \| benjamin.peterson \| 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) \| 1 line typo ........	2010-10-14 23:00:04 +00:00
Benjamin Peterson	8d26b0be6d	Merged revisions 80934 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r80934 \| benjamin.peterson \| 2010-05-07 13:58:23 -0500 (Fri, 07 May 2010) \| 69 lines Merged revisions 79911,79916-79917,80018,80418,80572-80573,80635-80639,80668,80922 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r79911 \| benjamin.peterson \| 2010-04-09 15:38:53 -0500 (Fri, 09 Apr 2010) \| 1 line use absolute import ........ r79916 \| benjamin.peterson \| 2010-04-09 16:05:21 -0500 (Fri, 09 Apr 2010) \| 1 line generalize detection of __future__ imports and attach them to the tree ........ r79917 \| benjamin.peterson \| 2010-04-09 16:11:44 -0500 (Fri, 09 Apr 2010) \| 1 line don't try to 'fix' relative imports when absolute_import is enabled #8858 ........ r80018 \| benjamin.peterson \| 2010-04-12 16:12:12 -0500 (Mon, 12 Apr 2010) \| 4 lines prevent diffs from being mangled is multiprocess mode #6409 Patch by George Boutsioukis. ........ r80418 \| benjamin.peterson \| 2010-04-23 16:00:03 -0500 (Fri, 23 Apr 2010) \| 1 line remove unhelpful description ........ r80572 \| benjamin.peterson \| 2010-04-27 20:33:54 -0500 (Tue, 27 Apr 2010) \| 1 line use unicode literals ........ r80573 \| jeffrey.yasskin \| 2010-04-27 23:08:27 -0500 (Tue, 27 Apr 2010) \| 6 lines Don't transform imports that are already relative. 2to3 turned from . import refactor into from .. import refactor which broke the transformation of 2to3 itself. ........ r80635 \| benjamin.peterson \| 2010-04-29 16:02:23 -0500 (Thu, 29 Apr 2010) \| 1 line remove imports ........ r80636 \| benjamin.peterson \| 2010-04-29 16:02:41 -0500 (Thu, 29 Apr 2010) \| 1 line unicode literal ........ r80637 \| benjamin.peterson \| 2010-04-29 16:03:42 -0500 (Thu, 29 Apr 2010) \| 1 line must pass a string to Number ........ r80638 \| benjamin.peterson \| 2010-04-29 16:05:34 -0500 (Thu, 29 Apr 2010) \| 1 line unicode literals ........ r80639 \| benjamin.peterson \| 2010-04-29 16:06:09 -0500 (Thu, 29 Apr 2010) \| 1 line pass string to Number ........ r80668 \| jeffrey.yasskin \| 2010-04-30 18:02:47 -0500 (Fri, 30 Apr 2010) \| 4 lines Make 2to3 run under Python 2.5 so that the benchmark suite at http://hg.python.org/benchmarks/ can use it and still run on implementations that haven't gotten to 2.6 yet. Fixes issue 8566. ........ r80922 \| benjamin.peterson \| 2010-05-07 11:06:25 -0500 (Fri, 07 May 2010) \| 1 line prevent xrange transformation from wrapping range calls it produces in list ........ ................	2010-05-07 19:10:11 +00:00
Martin v. Löwis	b1f7b7bef5	Merged revisions 77898 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r77898 \| martin.v.loewis \| 2010-02-01 02:15:39 +0100 (Mo, 01 Feb 2010) \| 17 lines Merged revisions 77855-77856,77870 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r77855 \| benjamin.peterson \| 2010-01-30 17:32:05 +0100 (Sa, 30 Jan 2010) \| 1 line don't return node if it is not changed ........ r77856 \| benjamin.peterson \| 2010-01-30 17:35:29 +0100 (Sa, 30 Jan 2010) \| 1 line return None to indicate no change ........ r77870 \| benjamin.peterson \| 2010-01-31 02:21:26 +0100 (So, 31 Jan 2010) \| 1 line never return the original node given to transform() ........ ................	2010-02-01 01:18:51 +00:00
Benjamin Peterson	d9af52ba7e	Merged revisions 76062 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r76062 \| benjamin.peterson \| 2009-11-02 12:12:12 -0600 (Mon, 02 Nov 2009) \| 70 lines Merged revisions 74359,75081,75088,75213,75278,75303,75427-75428,75734-75736,75865,76059-76061 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r74359 \| benjamin.peterson \| 2009-08-12 17:23:13 -0500 (Wed, 12 Aug 2009) \| 1 line don't pass the deprecated print_function option ........ r75081 \| benjamin.peterson \| 2009-09-26 22:02:57 -0500 (Sat, 26 Sep 2009) \| 1 line let 2to3 work with extended iterable unpacking ........ r75088 \| benjamin.peterson \| 2009-09-27 11:25:21 -0500 (Sun, 27 Sep 2009) \| 1 line look on the type only for __call__ ........ r75213 \| benjamin.peterson \| 2009-10-03 10:09:46 -0500 (Sat, 03 Oct 2009) \| 5 lines revert 75212; it's not correct People can use isinstance(x, collections.Callable) if they expect objects with __call__ in their instance dictionaries. ........ r75278 \| benjamin.peterson \| 2009-10-07 16:25:56 -0500 (Wed, 07 Oct 2009) \| 4 lines fix whitespace problems with fix_idioms #3563 Patch by Joe Amenta. ........ r75303 \| benjamin.peterson \| 2009-10-09 16:59:11 -0500 (Fri, 09 Oct 2009) \| 1 line port latin-1 and utf-8 cookie improvements ........ r75427 \| benjamin.peterson \| 2009-10-14 20:35:57 -0500 (Wed, 14 Oct 2009) \| 1 line force floor division ........ r75428 \| benjamin.peterson \| 2009-10-14 20:39:21 -0500 (Wed, 14 Oct 2009) \| 1 line silence -3 warnings about __hash__ ........ r75734 \| benjamin.peterson \| 2009-10-26 16:25:53 -0500 (Mon, 26 Oct 2009) \| 2 lines warn on map(None, ...) with more than 2 arguments #7203 ........ r75735 \| benjamin.peterson \| 2009-10-26 16:28:25 -0500 (Mon, 26 Oct 2009) \| 1 line remove unused result ........ r75736 \| benjamin.peterson \| 2009-10-26 16:29:02 -0500 (Mon, 26 Oct 2009) \| 1 line using get() here is a bit pointless ........ r75865 \| benjamin.peterson \| 2009-10-27 15:49:00 -0500 (Tue, 27 Oct 2009) \| 1 line explain reason for warning ........ r76059 \| benjamin.peterson \| 2009-11-02 11:43:47 -0600 (Mon, 02 Nov 2009) \| 1 line tuples are no longer used for children ........ r76060 \| benjamin.peterson \| 2009-11-02 11:55:40 -0600 (Mon, 02 Nov 2009) \| 1 line revert r76059; apparently some fixers rely on Leaf no () for children ........ r76061 \| benjamin.peterson \| 2009-11-02 12:06:17 -0600 (Mon, 02 Nov 2009) \| 1 line make fix_tuple_params keep the tree valid #7253 ........ ................	2009-11-02 18:16:28 +00:00
Benjamin Peterson	2c3ac6b875	Merged revisions 73370 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r73370 \| benjamin.peterson \| 2009-06-11 17:06:46 -0500 (Thu, 11 Jun 2009) \| 105 lines Merged revisions 72523,72950-72951,72994,73003,73033,73036-73040,73091-73093,73096,73179-73181,73192,73231,73244,73255-73256,73365 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r72523 \| benjamin.peterson \| 2009-05-09 14:42:26 -0500 (Sat, 09 May 2009) \| 1 line remove parenthesis ........ r72950 \| benjamin.peterson \| 2009-05-26 18:19:45 -0500 (Tue, 26 May 2009) \| 1 line remove unused imports ........ r72951 \| benjamin.peterson \| 2009-05-26 18:27:00 -0500 (Tue, 26 May 2009) \| 1 line this is no longer executable ........ r72994 \| benjamin.peterson \| 2009-05-28 15:32:54 -0500 (Thu, 28 May 2009) \| 1 line fix test_all_fixers on Windows #6134 ........ r73003 \| benjamin.peterson \| 2009-05-28 21:57:28 -0500 (Thu, 28 May 2009) \| 4 lines make 2to3 test utilities easier to use with other applications (3to2) Patch by Joe Amenta ........ r73033 \| benjamin.peterson \| 2009-05-29 16:58:32 -0500 (Fri, 29 May 2009) \| 1 line update grammar for multi with statement ........ r73036 \| benjamin.peterson \| 2009-05-29 17:33:20 -0500 (Fri, 29 May 2009) \| 1 line simplify fix_unicode ........ r73037 \| benjamin.peterson \| 2009-05-29 17:53:03 -0500 (Fri, 29 May 2009) \| 1 line add custom error for pattern syntax errors ........ r73038 \| benjamin.peterson \| 2009-05-29 17:55:00 -0500 (Fri, 29 May 2009) \| 1 line complain if details are attached to a token ........ r73039 \| benjamin.peterson \| 2009-05-29 18:00:28 -0500 (Fri, 29 May 2009) \| 1 line add a test for whitespace ........ r73040 \| benjamin.peterson \| 2009-05-29 18:01:17 -0500 (Fri, 29 May 2009) \| 1 line a fix for emacs highlighting ........ r73091 \| benjamin.peterson \| 2009-05-31 20:55:25 -0500 (Sun, 31 May 2009) \| 1 line deprecate set_prefix() and get_prefix() in favor of a prefix property ........ r73092 \| benjamin.peterson \| 2009-05-31 21:00:51 -0500 (Sun, 31 May 2009) \| 1 line change hideous java naming scheme ........ r73093 \| benjamin.peterson \| 2009-05-31 21:01:39 -0500 (Sun, 31 May 2009) \| 1 line remove dated comment ........ r73096 \| benjamin.peterson \| 2009-05-31 21:40:53 -0500 (Sun, 31 May 2009) \| 1 line group tests ........ r73179 \| benjamin.peterson \| 2009-06-03 13:09:53 -0500 (Wed, 03 Jun 2009) \| 1 line handle the case where there's multiple trailers #6185 ........ r73180 \| benjamin.peterson \| 2009-06-03 13:18:05 -0500 (Wed, 03 Jun 2009) \| 1 line scrap __main__ section ........ r73181 \| benjamin.peterson \| 2009-06-03 13:24:48 -0500 (Wed, 03 Jun 2009) \| 1 line remove shebang lines and __main__ sections ........ r73192 \| benjamin.peterson \| 2009-06-03 19:16:30 -0500 (Wed, 03 Jun 2009) \| 4 lines actually test something here Thanks to Joe Amenta for noticing.y ........ r73231 \| benjamin.peterson \| 2009-06-04 13:38:50 -0500 (Thu, 04 Jun 2009) \| 1 line remove unused variable ........ r73244 \| benjamin.peterson \| 2009-06-05 08:39:25 -0500 (Fri, 05 Jun 2009) \| 1 line allow fixers to give different options in setUp ........ r73255 \| benjamin.peterson \| 2009-06-06 11:23:46 -0500 (Sat, 06 Jun 2009) \| 1 line fix the except fixer on one line suites #6222 ........ r73256 \| benjamin.peterson \| 2009-06-06 11:27:40 -0500 (Sat, 06 Jun 2009) \| 1 line test one-line else and finally clauses ........ r73365 \| benjamin.peterson \| 2009-06-11 17:01:32 -0500 (Thu, 11 Jun 2009) \| 1 line normalize whitespace ........ ................	2009-06-11 23:47:38 +00:00
Benjamin Peterson	df6dc8f107	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
Martin v. Löwis	f733c60d9a	Merged revisions 61602 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r61602 \| martin.v.loewis \| 2008-03-19 00:22:42 -0500 (Mi, 19 Mär 2008) \| 17 lines Merged revisions 61598-61599,61601 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r61598 \| david.wolever \| 2008-03-18 23:58:33 -0500 (Di, 18 Mär 2008) \| 1 line Added fixer for zip, and refactored a bit of code in the process. Closing #2171. ........ r61599 \| david.wolever \| 2008-03-19 00:04:26 -0500 (Mi, 19 Mär 2008) \| 3 lines Removed a bunch of duplicate code -- it's in util now. ........ r61601 \| martin.v.loewis \| 2008-03-19 00:21:12 -0500 (Mi, 19 Mär 2008) \| 2 lines Fix whitespace. ........ ................	2008-03-19 05:26:18 +00:00
Martin v. Löwis	ef04c44e29	Merged revisions 61596-61597 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r61596 \| martin.v.loewis \| 2008-03-18 23:43:46 -0500 (Di, 18 Mär 2008) \| 2 lines Import lib2to3. ........ r61597 \| martin.v.loewis \| 2008-03-18 23:58:04 -0500 (Di, 18 Mär 2008) \| 3 lines Initialized merge tracking via "svnmerge" with revisions "1-61595" from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........	2008-03-19 05:04:44 +00:00

8 Commits