diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-11-10 22:21:32 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-11-10 22:21:32 +0000 |
| commit | fd0e763c4e71dd01d92df93ac829fe962dd4da68 (patch) | |
| tree | 99b86b3958a0651e074bbad073297565c90a3817 /Python/import.c | |
| parent | 49ae612f740fcfbc45bbc0300931387a9843ed51 (diff) | |
| download | cpython-git-fd0e763c4e71dd01d92df93ac829fe962dd4da68.tar.gz | |
Merged revisions 67180 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67180 | benjamin.peterson | 2008-11-10 16:11:12 -0600 (Mon, 10 Nov 2008) | 29 lines
Merged revisions 66985,67170,67173,67177-67179 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66985 | benjamin.peterson | 2008-10-20 16:43:46 -0500 (Mon, 20 Oct 2008) | 1 line
no need to use nested try, except, finally
........
r67170 | benjamin.peterson | 2008-11-08 12:28:31 -0600 (Sat, 08 Nov 2008) | 1 line
fix #4271: fix_imports didn't recognize imports with parenthesis (ie from x import (a, b))
........
r67173 | benjamin.peterson | 2008-11-08 17:42:08 -0600 (Sat, 08 Nov 2008) | 1 line
consolidate test
........
r67177 | benjamin.peterson | 2008-11-09 21:52:52 -0600 (Sun, 09 Nov 2008) | 1 line
let the metclass fixer handle complex assignments in the class body gracefully
........
r67178 | benjamin.peterson | 2008-11-10 15:26:43 -0600 (Mon, 10 Nov 2008) | 1 line
the metaclass fixers shouldn't die when bases are not a simple name
........
r67179 | benjamin.peterson | 2008-11-10 15:29:58 -0600 (Mon, 10 Nov 2008) | 1 line
allow the fix_import pattern to catch from imports with parenthesis
........
................
Diffstat (limited to 'Python/import.c')
0 files changed, 0 insertions, 0 deletions