Author: Armin Rigo <[email protected]>
Branch:
Changeset: r64762:155e0c2706e2
Date: 2013-06-04 11:36 +0200
http://bitbucket.org/pypy/pypy/changeset/155e0c2706e2/
Log: Revert this change, unsure why it was there (maybe some merge
mistake?)
diff --git a/pypy/interpreter/app_main.py b/pypy/interpreter/app_main.py
--- a/pypy/interpreter/app_main.py
+++ b/pypy/interpreter/app_main.py
@@ -3,7 +3,7 @@
# See test/test_app_main.
# Missing vs CPython: -d, -t, -v, -x, -3
-"""\
+USAGE1 = __doc__ = """\
Options and arguments (and corresponding environment variables):
-B : don't write .py[co] files on import; also PYTHONDONTWRITEBYTECODE=x
-c cmd : program passed in as string (terminates option list)
@@ -28,7 +28,6 @@
PyPy options and arguments:
--info : print translation information about this PyPy executable
"""
-USAGE1 = __doc__
# Missing vs CPython: PYTHONHOME, PYTHONCASEOK
USAGE2 = """
Other environment variables:
@@ -157,12 +156,13 @@
raise SystemExit
def print_help(*args):
- print 'usage: %s [options] [-c cmd|-m mod|file.py|-] [arg...]' % (
+ import os
+ print 'usage: %s [option] ... [-c cmd | -m mod | file | -] [arg] ...' % (
sys.executable,)
- print __doc__.rstrip()
+ print USAGE1,
if 'pypyjit' in sys.builtin_module_names:
- print " --jit OPTIONS advanced JIT options: try 'off' or 'help'"
- print
+ print "--jit options: advanced JIT options: try 'off' or 'help'"
+ print (USAGE2 % (os.pathsep,)),
raise SystemExit
def _print_jit_help():
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
