From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 9 Aug 2010 08:29:08 +0000 (+0000)
Subject: Merge the 2to3 script from /sandbox/trunk/2to3/2to3, revision 72867 (latest).
X-Git-Tag: v3.2a2~398
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25803f70fb2fca64081d412e113ea353e3715559;p=python

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

diff --git a/Tools/scripts/2to3 b/Tools/scripts/2to3
index 2a447cffea..fbd4aa6b83 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"))