Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r59771:5770ebef6742
Date: 2013-01-05 20:04 +0100
http://bitbucket.org/pypy/pypy/changeset/5770ebef6742/
Log: Fixed a few missing py.py renames
diff --git a/pypy/bin/pyinteractive.py b/pypy/bin/pyinteractive.py
--- a/pypy/bin/pyinteractive.py
+++ b/pypy/bin/pyinteractive.py
@@ -2,7 +2,7 @@
"""Main entry point into the PyPy interpreter. For a list of options, type
- py.py --help
+ pyinteractive.py --help
"""
@@ -21,7 +21,7 @@
from pypy.config import pypyoption
-cmdline_optiondescr = OptionDescription("interactive", "the options of py.py",
[
+cmdline_optiondescr = OptionDescription("interactive", "the options of
pyinteractive.py", [
BoolOption("verbose", "show verbose interpreter-level traceback",
default=os.getenv("PYPY_TB"), cmdline="-v"),
BoolOption("interactive", "inspect interactively after running script",
@@ -189,6 +189,6 @@
if __name__ == '__main__':
if hasattr(sys, 'setrecursionlimit'):
- # for running "python -i py.py -Si -- py.py -Si"
+ # for running "python -i pyinteractive.py -Si -- py.py -Si"
sys.setrecursionlimit(3000)
sys.exit(main_(sys.argv))
diff --git a/pypy/doc/getting-started-dev.rst b/pypy/doc/getting-started-dev.rst
--- a/pypy/doc/getting-started-dev.rst
+++ b/pypy/doc/getting-started-dev.rst
@@ -256,7 +256,7 @@
If you start an untranslated Python interpreter via::
- python pypy/bin/py.py
+ python pypy/bin/pyinteractive.py
If you press
<Ctrl-C> on the console you enter the interpreter-level console, a
diff --git a/pypy/doc/getting-started-python.rst
b/pypy/doc/getting-started-python.rst
--- a/pypy/doc/getting-started-python.rst
+++ b/pypy/doc/getting-started-python.rst
@@ -241,19 +241,19 @@
most code will be fine. However, the ``sys.prefix`` will be unset
and some existing libraries assume that this is never the case.
-.. _`py.py interpreter`:
+.. _`pyinteractive.py interpreter`:
Running the Python Interpreter Without Translation
---------------------------------------------------
-The py.py interpreter
+The pyinteractive.py interpreter
+++++++++++++++++++++
To start interpreting Python with PyPy, install a C compiler that is
supported by distutils and use Python 2.5 or greater to run PyPy::
cd pypy
- python bin/py.py
+ python bin/pyinteractive.py
After a few seconds (remember: this is running on top of CPython),
you should be at the PyPy prompt, which is the same as the Python
@@ -273,24 +273,24 @@
PyPy version (i.e. when PyPy's interpreter itself is being interpreted
by CPython).
-py.py options
+pyinteractive.py options
+++++++++++++
To list the PyPy interpreter command line options, type::
cd pypy
- python bin/py.py --help
+ python bin/pyinteractive.py --help
-py.py supports most of the options that CPython supports too (in addition to a
-large amount of options that can be used to customize py.py).
+pyinteractive.py supports most of the options that CPython supports too (in
addition to a
+large amount of options that can be used to customize pyinteractive.py).
As an example of using PyPy from the command line, you could type::
- python py.py -c "from test import pystone; pystone.main(10)"
+ python pyinteractive.py -c "from test import pystone; pystone.main(10)"
Alternatively, as with regular Python, you can simply give a
script name on the command line::
- python py.py ../../lib-python/2.7/test/pystone.py 10
+ python pyinteractive.py ../../lib-python/2.7/test/pystone.py 10
See our `configuration sections`_ for details about what all the commandline
options do.
diff --git a/pypy/interpreter/test/test_zpy.py
b/pypy/interpreter/test/test_zpy.py
--- a/pypy/interpreter/test/test_zpy.py
+++ b/pypy/interpreter/test/test_zpy.py
@@ -5,7 +5,7 @@
import pypy
import subprocess
-pypypath = py.path.local(pypy.__file__).dirpath("bin", "py.py")
+pypypath = py.path.local(pypy.__file__).dirpath("bin", "pyinteractive.py")
def run(*args):
argslist = map(str, args)
diff --git a/pypy/module/_minimal_curses/test/test_curses.py
b/pypy/module/_minimal_curses/test/test_curses.py
--- a/pypy/module/_minimal_curses/test/test_curses.py
+++ b/pypy/module/_minimal_curses/test/test_curses.py
@@ -25,7 +25,7 @@
return child
def spawn(self, argv):
- py_py = py.path.local(pypydir).join('bin', 'py.py')
+ py_py = py.path.local(pypydir).join('bin', 'pyinteractive.py')
return self._spawn(sys.executable, [str(py_py)] + argv)
def setup_class(self):
diff --git a/pypy/module/posix/test/test_posix2.py
b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -1127,7 +1127,7 @@
return child
def spawn(self, argv):
- py_py = py.path.local(pypydir).join('bin', 'py.py')
+ py_py = py.path.local(pypydir).join('bin', 'pyinteractive.py')
return self._spawn(sys.executable, [str(py_py)] + argv)
def test_ttyname(self):
diff --git a/pypy/module/termios/test/test_termios.py
b/pypy/module/termios/test/test_termios.py
--- a/pypy/module/termios/test/test_termios.py
+++ b/pypy/module/termios/test/test_termios.py
@@ -14,7 +14,7 @@
import termios
except ImportError:
py.test.skip("termios not found")
- py_py = py.path.local(pypydir).join('bin', 'py.py')
+ py_py = py.path.local(pypydir).join('bin', 'pyinteractive.py')
assert py_py.check()
cls.py_py = py_py
cls.termios = termios
diff --git a/pypy/objspace/std/test/test_setobject.py
b/pypy/objspace/std/test/test_setobject.py
--- a/pypy/objspace/std/test/test_setobject.py
+++ b/pypy/objspace/std/test/test_setobject.py
@@ -3,7 +3,7 @@
in the stdlibs test/test_set.py which is located in lib-python
go there and invoke::
- ../../../pypy/bin/py.py test_set.py
+ ../../../pypy/bin/pyinteractive.py test_set.py
This file just contains some basic tests that make sure, the implementation
is not too wrong.
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
