[pypy-svn] r32876 - in pypy/dist/pypy: bin tool

[arigo at codespeak.net]

Author: arigo
Date: Wed Oct  4 16:29:08 2006
New Revision: 32876

Modified:
   pypy/dist/pypy/bin/jscompile.py
   pypy/dist/pypy/tool/option.py
Log:
Backward compatibility in the new option logic for simple cases.
Also add the current dir in sys.path in jscompile.


Modified: pypy/dist/pypy/bin/jscompile.py
==============================================================================
--- pypy/dist/pypy/bin/jscompile.py	(original)
+++ pypy/dist/pypy/bin/jscompile.py	Wed Oct  4 16:29:08 2006
@@ -7,12 +7,12 @@
 """
 
 import autopath
-import sys
+import sys, os
 
 from pypy.translator.js.main import rpython2javascript_main, Options
 
 from pypy.tool import option
-import optparse
+from py.compat import optparse
 make_option = optparse.make_option
 
 def get_options():
@@ -38,4 +38,7 @@
 
 if __name__ == '__main__':
     argv = process_options(sys.argv[1:])
+    curdir = os.getcwd()
+    if curdir not in sys.path:
+        sys.path.insert(0, curdir)
     rpython2javascript_main(argv, Options)

Modified: pypy/dist/pypy/tool/option.py
==============================================================================
--- pypy/dist/pypy/tool/option.py	(original)
+++ pypy/dist/pypy/tool/option.py	Wed Oct  4 16:29:08 2006
@@ -3,7 +3,7 @@
 
 import os
 from pypy.config.pypyoption import pypy_optiondescription
-from pypy.config.config import Config, to_optparse
+from pypy.config.config import Config, OptionDescription, to_optparse
 from py.compat import optparse
 make_option = optparse.make_option
 
@@ -36,6 +36,14 @@
 def process_options(op, input_options, argv=None):
     global Options
     Options = input_options
+    # backward compatilibity
+    if isinstance(op, list):
+        import sys, os
+        basename = os.path.basename(sys.argv[0])
+        config = Config(OptionDescription(basename, basename, []))
+        parser = to_optparse(config)
+        parser.add_options(op)
+        op = parser
     op.disable_interspersed_args()
     options, args = op.parse_args(argv, input_options)
     return args