Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest).

diff --git a/Tools/scripts/2to3 b/Tools/scripts/2to3
index 2a447cffeaf3608ff8d7e73e07fafc99adccb107..fbd4aa6b838234014af3619fd3f4d8d9c999025d 100755 (executable)
--- 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"))