[Python-checkins] cpython (merge 3.1 -> 3.2): #11985: merge with 3.1.
ezio.melotti
python-checkins at python.org
Tue May 3 19:44:44 CEST 2011
http://hg.python.org/cpython/rev/5e661f5c301a
changeset: 69808:5e661f5c301a
branch: 3.2
parent: 69801:4219747d3765
parent: 69807:4d946d4166fc
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Tue May 03 20:43:48 2011 +0300
summary:
#11985: merge with 3.1.
files:
Doc/library/platform.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -107,7 +107,7 @@
.. function:: python_implementation()
Returns a string identifying the Python implementation. Possible return values
- are: 'CPython', 'IronPython', 'Jython'.
+ are: 'CPython', 'IronPython', 'Jython', 'PyPy'.
.. function:: python_revision()
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list