[pypy-svn] r33323 - pypy/dist/pypy/translator/jvm
arigo at codespeak.net
arigo at codespeak.net
Mon Oct 16 13:47:17 CEST 2006
Author: arigo
Date: Mon Oct 16 13:47:16 2006
New Revision: 33323
Modified:
pypy/dist/pypy/translator/jvm/conftest.py
Log:
Fixes(?) to translator/jvm/conftest.py. For very indirect reasons this
conftest.py is loaded if we type 'py.test' in a sibling directory like
translator/cli or translator/c. At least in a Python 2.4 environment,
the previous jvm/conftest.py was causing optparse to crash.
Modified: pypy/dist/pypy/translator/jvm/conftest.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/conftest.py (original)
+++ pypy/dist/pypy/translator/jvm/conftest.py Mon Oct 16 13:47:16 2006
@@ -5,15 +5,15 @@
option = py.test.Config.addoptions(
"pypy-jvm options",
- Option('--javac', action='', dest='javac', default='javac',
+ Option('--javac', action='store', dest='javac', default='javac',
help='Define the java compiler to use'),
- Option('--java', action='', dest='java', default='java',
+ Option('--java', action='store', dest='java', default='java',
help='Define the java executable to use'),
- Option('--view', action='store_true', dest='view', default=False,
- help='View the graphs before they are generated'),
+## Option('--view', action='store_true', dest='view', default=False,
+## help='View the graphs before they are generated'),
Option('--wd', action='store_true', dest='wd', default=False,
help='Output to current directory instead of /tmp'),
- Option('--package', action='', dest='package', default='pypy',
+ Option('--package', action='store', dest='package', default='pypy',
help='Package to output generated classes into')
#Option('--opt', action='XXX', dest='YYY', default=DEF, help='HELP')
)
More information about the Pypy-commit
mailing list