[Python-checkins] r83878 - python/branches/py3k/Tools/scripts/2to3

[florent.xicluna]

Author: florent.xicluna
Date: Mon Aug  9 10:29:08 2010
New Revision: 83878

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

Modified:
   python/branches/py3k/Tools/scripts/2to3

Modified: python/branches/py3k/Tools/scripts/2to3
==============================================================================
--- python/branches/py3k/Tools/scripts/2to3	(original)
+++ python/branches/py3k/Tools/scripts/2to3	Mon Aug  9 10:29:08 2010
@@ -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"))