[pypy-commit] pypy default: Update sys.version to 2.7.3, and fix some old version numbers in the docs.

[amauryfa]

Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: 
Changeset: r57236:a8cd9059c499
Date: 2012-09-07 22:21 +0200
http://bitbucket.org/pypy/pypy/changeset/a8cd9059c499/

Log:	Update sys.version to 2.7.3, and fix some old version numbers in the
	docs. Also add the branch to the list of merged feature branches.

diff --git a/pypy/doc/coding-guide.rst b/pypy/doc/coding-guide.rst
--- a/pypy/doc/coding-guide.rst
+++ b/pypy/doc/coding-guide.rst
@@ -586,7 +586,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.7.1.  We
+modules of CPython's standard library, currently from version 2.7.3.  We
 sometimes need to `modify modules`_ and - more often - regression tests
 because they rely on implementation details of CPython.
 
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
@@ -238,7 +238,7 @@
 To run CPython regression tests you can point to the ``lib-python``
 directory::
 
-    py.test lib-python/2.7.0/test/test_datetime.py
+    py.test lib-python/2.7/test/test_datetime.py
 
 This will usually take a long time because this will run
 the PyPy Python interpreter on top of CPython.  On the plus
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
@@ -226,15 +226,15 @@
 
 The hierarchy shown above is relative to a PREFIX directory.  PREFIX is
 computed by starting from the directory where the executable resides, and
-"walking up" the filesystem until we find a directory containing ``lib_pypy``,
-``lib-python/2.7`` and ``lib-python/2.7.1``.
+"walking up" the filesystem until we find a directory containing ``lib_pypy``
+and ``lib-python/2.7``.
 
 The archives (.tar.bz2 or .zip) containing PyPy releases already contain the
 correct hierarchy, so to run PyPy it's enough to unpack the archive, and run
 the ``bin/pypy`` executable.
 
 To install PyPy system wide on unix-like systems, it is recommended to put the
-whole hierarchy alone (e.g. in ``/opt/pypy1.6``) and put a symlink to the
+whole hierarchy alone (e.g. in ``/opt/pypy1.9``) and put a symlink to the
 ``pypy`` executable into ``/usr/bin`` or ``/usr/local/bin``
 
 If the executable fails to find suitable libraries, it will report
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -28,6 +28,8 @@
 .. branch: ffi-backend
 Support CFFI.  http://morepypy.blogspot.ch/2012/08/cffi-release-03.html
 .. branch: speedup-unpackiterable
+.. branch: stdlib-2.7.3
+The stdlib was updated to version 2.7.3
 
 
 .. "uninteresting" branches that we should just ignore for the whatsnew:
diff --git a/pypy/module/sys/version.py b/pypy/module/sys/version.py
--- a/pypy/module/sys/version.py
+++ b/pypy/module/sys/version.py
@@ -7,7 +7,7 @@
 from pypy.interpreter import gateway
 
 #XXX # the release serial 42 is not in range(16)
-CPYTHON_VERSION            = (2, 7, 2, "final", 42)   
+CPYTHON_VERSION            = (2, 7, 3, "final", 42)
 #XXX # sync CPYTHON_VERSION with patchlevel.h, package.py
 CPYTHON_API_VERSION        = 1013   #XXX # sync with include/modsupport.h