[pypy-svn] r59836 - pypy/trunk/pypy/doc
arigo at codespeak.net
arigo at codespeak.net
Sun Nov 9 17:31:39 CET 2008
Author: arigo
Date: Sun Nov 9 17:31:37 2008
New Revision: 59836
Modified:
pypy/trunk/pypy/doc/coding-guide.txt
pypy/trunk/pypy/doc/getting-started.txt
pypy/trunk/pypy/doc/interpreter.txt
Log:
Rename 2.4.1 to 2.5.2 in the docs.
Modified: pypy/trunk/pypy/doc/coding-guide.txt
==============================================================================
--- pypy/trunk/pypy/doc/coding-guide.txt (original)
+++ pypy/trunk/pypy/doc/coding-guide.txt Sun Nov 9 17:31:37 2008
@@ -621,7 +621,7 @@
Modules visible from application programs are imported from
interpreter or application level files. PyPy reuses almost all python
-modules of CPython's standard library, currently from version 2.4.1. We
+modules of CPython's standard library, currently from version 2.5.2. We
sometimes need to `modify modules`_ and - more often - regression tests
because they rely on implementation details of CPython.
@@ -650,15 +650,15 @@
>>>> operator.__file__
'/home/hpk/pypy-dist/pypy/lib/operator.py'
- >>>> import types
- >>>> types.__file__
- '/home/hpk/pypy-dist/lib-python/modified-2.4.1/types.py'
+ >>>> import opcode
+ >>>> opcode.__file__
+ '/home/hpk/pypy-dist/lib-python/modified-2.5.2/opcode.py'
>>>> import os
faking <type 'posix.stat_result'>
faking <type 'posix.statvfs_result'>
>>>> os.__file__
- '/home/hpk/pypy-dist/lib-python/2.4.1/os.py'
+ '/home/hpk/pypy-dist/lib-python/2.5.2/os.py'
>>>>
Module directories / Import order
@@ -681,11 +681,11 @@
contains pure Python reimplementation of modules.
-*lib-python/modified-2.4.1/*
+*lib-python/modified-2.5.2/*
The files and tests that we have modified from the CPython library.
-*lib-python/2.4.1/*
+*lib-python/2.5.2/*
The unmodified CPython library. **Never ever check anything in there**.
@@ -700,14 +700,14 @@
by default and CPython has a number of places where it relies
on some classes being old-style.
-If you want to change a module or test contained in ``lib-python/2.4.1``
-then make sure that you copy the file to our ``lib-python/modified-2.4.1``
+If you want to change a module or test contained in ``lib-python/2.5.2``
+then make sure that you copy the file to our ``lib-python/modified-2.5.2``
directory first. In subversion commandline terms this reads::
- svn cp lib-python/2.4.1/somemodule.py lib-python/modified-2.4.1/
+ svn cp lib-python/2.5.2/somemodule.py lib-python/modified-2.5.2/
and subsequently you edit and commit
-``lib-python/modified-2.4.1/somemodule.py``. This copying operation is
+``lib-python/modified-2.5.2/somemodule.py``. This copying operation is
important because it keeps the original CPython tree clean and makes it
obvious what we had to change.
Modified: pypy/trunk/pypy/doc/getting-started.txt
==============================================================================
--- pypy/trunk/pypy/doc/getting-started.txt (original)
+++ pypy/trunk/pypy/doc/getting-started.txt Sun Nov 9 17:31:37 2008
@@ -180,7 +180,7 @@
Alternatively, as with regular Python, you can simply give a
script name on the command line::
- python py.py ../../lib-python/2.4.1/test/pystone.py 10
+ python py.py ../../lib-python/2.5.2/test/pystone.py 10
See our `configuration sections`_ for details about what all the commandline
options do.
@@ -312,14 +312,14 @@
Finally, there are the CPython regression tests which you can
run like this (this will take hours and hours and hours)::
- cd lib-python/2.4.1/test
+ cd lib-python/2.5.2/test
python ../../../pypy/test_all.py
or if you have `installed py.test`_ then you simply say::
py.test -E
-from the lib-python/2.4.1/test directory. Running one of the above
+from the lib-python/2.5.2/test directory. Running one of the above
commands tells you how to proceed.
.. _`installed py.test`: https://codespeak.net/py/current/doc/download.html
@@ -657,7 +657,7 @@
debug: argv ->
debug: importing code
debug: calling code.interact()
- Python 2.4.1 (pypy 0.9.0 build 38134) on linux2
+ Python 2.5.2 (pypy 1.0.0 build 5xxxx) on linux2
Type "help", "copyright", "credits" or "license" for more information.
(InteractiveConsole)
>>>> 1 + 1
@@ -721,11 +721,11 @@
For installation purposes, note that the executable needs to be able to
find its version of the Python standard library in the following three
-directories: ``lib-python/2.4.1``, ``lib-python/modified-2.4.1`` and
+directories: ``lib-python/2.5.2``, ``lib-python/modified-2.5.2`` and
``pypy/lib``. They are located by "looking around" starting from the
directory in which the executable resides. The current logic is to try
to find a ``PREFIX`` from which the directories
-``PREFIX/lib-python/2.4.1`` and ``PREFIX/lib-python/modified.2.4.1`` and
+``PREFIX/lib-python/2.5.2`` and ``PREFIX/lib-python/modified.2.5.2`` and
``PREFIX/pypy/lib`` can all be found. The prefixes that are tried are::
.
Modified: pypy/trunk/pypy/doc/interpreter.txt
==============================================================================
--- pypy/trunk/pypy/doc/interpreter.txt (original)
+++ pypy/trunk/pypy/doc/interpreter.txt Sun Nov 9 17:31:37 2008
@@ -37,7 +37,7 @@
calling its ``frame.eval()`` method. This main entry point
initialise appropriate namespaces and then interprets each
bytecode instruction. Python's standard library contains
-the `lib-python/2.4.1/dis.py`_ module which allows to view
+the `lib-python/2.5.2/dis.py`_ module which allows to view
the Virtual's machine bytecode instructions::
>>> import dis
More information about the Pypy-commit
mailing list