Author: Alex Gaynor <alex.gay...@gmail.com> Branch: Changeset: r65754:fe9ac340d631 Date: 2013-07-28 12:38 -0700 http://bitbucket.org/pypy/pypy/changeset/fe9ac340d631/
Log: merged upstream diff --git a/pypy/tool/pypyjit.py b/pypy/tool/pypyjit.py --- a/pypy/tool/pypyjit.py +++ b/pypy/tool/pypyjit.py @@ -7,11 +7,18 @@ import py, os +try: + py.test.config.option.runappdirect +except AttributeError: + import sys + print >> sys.stderr, __doc__ + sys.exit(2) + from pypy.objspace.std import Space from rpython.config.translationoption import set_opt_level from pypy.config.pypyoption import get_pypy_config, set_pypy_opt_level from pypy.objspace.std import multimethod -from rpython.rtyper.annlowlevel import llhelper, llstr, oostr, hlstr +from rpython.rtyper.annlowlevel import llhelper, llstr, hlstr from rpython.rtyper.lltypesystem.rstr import STR from rpython.rtyper.lltypesystem import lltype from pypy.interpreter.pycode import PyCode _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit
