summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-08-09 08:29:08 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-08-09 08:29:08 (GMT)
commit25803f70fb2fca64081d412e113ea353e3715559 (patch)
tree7480b0b7c01f03c9b62df18b95e47096bca1e343
parent9f347ea5457604694a8e1f94e18e9d00e85bded7 (diff)
downloadcpython-25803f70fb2fca64081d412e113ea353e3715559.zip
cpython-25803f70fb2fca64081d412e113ea353e3715559.tar.gz
cpython-25803f70fb2fca64081d412e113ea353e3715559.tar.bz2
Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest).
-rwxr-xr-xTools/scripts/2to33
1 files changed, 1 insertions, 2 deletions
diff --git a/Tools/scripts/2to3 b/Tools/scripts/2to3
index 2a447cf..fbd4aa6 100755
--- a/Tools/scripts/2to3
+++ b/Tools/scripts/2to3
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-from lib2to3.main import main
import sys
-import os
+from lib2to3.main import main
sys.exit(main("lib2to3.fixes"))