]> granicus.if.org Git - python/commit
Merged revisions 61602 via svnmerge from
authorMartin v. Löwis <martin@v.loewis.de>
Wed, 19 Mar 2008 05:26:18 +0000 (05:26 +0000)
committerMartin v. Löwis <martin@v.loewis.de>
Wed, 19 Mar 2008 05:26:18 +0000 (05:26 +0000)
commitf733c60d9aea123a46cd41dbe4dedee7aa2f20f3
tree9088f72f6f0177c41bfd68c186ccfe6d2adeed22
parentef04c44e29a8276a484f58d03a75a2dec516302d
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.
  ........
................
24 files changed:
Lib/lib2to3/fixes/basefix.py
Lib/lib2to3/fixes/fix_except.py
Lib/lib2to3/fixes/fix_filter.py
Lib/lib2to3/fixes/fix_future.py
Lib/lib2to3/fixes/fix_has_key.py
Lib/lib2to3/fixes/fix_idioms.py
Lib/lib2to3/fixes/fix_imports.py
Lib/lib2to3/fixes/fix_map.py
Lib/lib2to3/fixes/fix_ne.py
Lib/lib2to3/fixes/fix_next.py
Lib/lib2to3/fixes/fix_print.py
Lib/lib2to3/fixes/fix_raise.py
Lib/lib2to3/fixes/fix_renames.py
Lib/lib2to3/fixes/fix_repr.py
Lib/lib2to3/fixes/fix_tuple_params.py
Lib/lib2to3/fixes/fix_unicode.py
Lib/lib2to3/fixes/fix_ws_comma.py
Lib/lib2to3/fixes/fix_zip.py [new file with mode: 0644]
Lib/lib2to3/fixes/util.py
Lib/lib2to3/refactor.py
Lib/lib2to3/tests/benchmark.py
Lib/lib2to3/tests/test_fixers.py
Lib/lib2to3/tests/test_parser.py
Lib/lib2to3/tests/test_pytree.py