| 
								
								
									 Benjamin Peterson | c47753b38f | Merged revisions 65026 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk
................
  r65026 | benjamin.peterson | 2008-07-16 13:48:35 -0500 (Wed, 16 Jul 2008) | 9 lines
  Merged revisions 65025 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r65025 | benjamin.peterson | 2008-07-16 13:46:30 -0500 (Wed, 16 Jul 2008) | 1 line
    remove use of has_key
  ........
................ | 2008-07-16 18:52:50 +00:00 |  | 
				
					
						| 
								
								
									 Benjamin Peterson | d613bb4c29 | Merged revisions 65019 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk
................
  r65019 | benjamin.peterson | 2008-07-16 12:01:46 -0500 (Wed, 16 Jul 2008) | 43 lines
  Merged revisions 64863,64868,64870,64942,65001-65002,65017-65018 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r64863 | brett.cannon | 2008-07-10 19:42:32 -0500 (Thu, 10 Jul 2008) | 1 line
    Add urlparse -> urllib.parse to fix_imports.
  ........
    r64868 | brett.cannon | 2008-07-10 20:00:10 -0500 (Thu, 10 Jul 2008) | 1 line
    Add robotparser -> urllib.robotparser to fix_imports.
  ........
    r64870 | brett.cannon | 2008-07-11 00:56:27 -0500 (Fri, 11 Jul 2008) | 6 lines
    Fix the fixers for the new dbm package.
    Had to create a new fixer (fix_imports2) which did fixes in post-order. This
    because ``import anydbm`` was being translated into ``import dbm`` which was
    then subsequently changed into ``import dbm.ndbm``; one transform too many.
  ........
    r64942 | collin.winter | 2008-07-13 20:19:05 -0500 (Sun, 13 Jul 2008) | 1 line
    Add a comment explaining part of fix_imports.py
  ........
    r65001 | brett.cannon | 2008-07-16 00:11:12 -0500 (Wed, 16 Jul 2008) | 2 lines
    Remove some extraneous whitespace.
  ........
    r65002 | brett.cannon | 2008-07-16 00:12:04 -0500 (Wed, 16 Jul 2008) | 4 lines
    Implement a fixer for urllib(2).
    Thanks Nick Edds for the patch.
  ........
    r65017 | benjamin.peterson | 2008-07-16 11:04:19 -0500 (Wed, 16 Jul 2008) | 1 line
    fix 2to3 in Python 2.6
  ........
    r65018 | benjamin.peterson | 2008-07-16 11:55:21 -0500 (Wed, 16 Jul 2008) | 1 line
    normalize whitespace
  ........
................ | 2008-07-16 18:44:47 +00:00 |  |