[Python-checkins] r88534 - in python/branches/py3k: Lib/lib2to3/__main__.py Tools/scripts/2to3

[brett.cannon]

Author: brett.cannon
Date: Wed Feb 23 19:48:52 2011
New Revision: 88534

Log:
Revert r88503 as Benjamin's request.

Removed:
   python/branches/py3k/Lib/lib2to3/__main__.py
Modified:
   python/branches/py3k/Tools/scripts/2to3

Deleted: python/branches/py3k/Lib/lib2to3/__main__.py
==============================================================================
--- python/branches/py3k/Lib/lib2to3/__main__.py	Wed Feb 23 19:48:52 2011
+++ (empty file)
@@ -1,4 +0,0 @@
-import sys
-from .main import main
-
-sys.exit(main("lib2to3.fixes"))

Modified: python/branches/py3k/Tools/scripts/2to3
==============================================================================
--- python/branches/py3k/Tools/scripts/2to3	(original)
+++ python/branches/py3k/Tools/scripts/2to3	Wed Feb 23 19:48:52 2011
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
-import runpy
+import sys
+from lib2to3.main import main
 
-runpy.run_module('lib2to3', run_name='__main__', alter_sys=True)
+sys.exit(main("lib2to3.fixes"))