From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 25 Nov 2008 04:09:48 +0000 (+0000)
Subject: Blocked revisions 67376 via svnmerge
X-Git-Tag: v3.0~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d56976c9a298074c38efcd4cc32ee0459a5aa096;p=python

Blocked revisions 67376 via svnmerge

................
  r67376 | benjamin.peterson | 2008-11-24 22:07:45 -0600 (Mon, 24 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
  ........
................
---