Merged revisions 67376 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r67376 | benjamin.peterson | 2008-11-25 05:07:45 +0100 (Tue, 25 Nov 2008) | 17 lines

  Merged revisions 67183,67191,67371 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r67183 | benjamin.peterson | 2008-11-10 21:51:33 -0600 (Mon, 10 Nov 2008) | 1 line

    handle 'import x as y' in fix_imports; this still needs more work...
  ........
    r67191 | benjamin.peterson | 2008-11-11 17:24:51 -0600 (Tue, 11 Nov 2008) | 1 line

    super() is good
  ........
    r67371 | benjamin.peterson | 2008-11-24 16:02:00 -0600 (Mon, 24 Nov 2008) | 1 line

    don't blow up in the metaclass fixer when assignments in the class statement aren't simple
  ........
................
3 files changed