summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-05-04 15:39:29 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-05-04 15:39:29 (GMT)
commite548f5a0018fb44ed3a2a365ff0c8c87e397eedd (patch)
treef9a54f503ed79f4612ad937f2c0efe7b2cf1b1da
parent03b8d4e47b06024fc6886910abf7c8935fba8141 (diff)
parentf16898bc80fafeaf025606ea00e841c310b8df39 (diff)
downloadcpython-e548f5a0018fb44ed3a2a365ff0c8c87e397eedd.zip
cpython-e548f5a0018fb44ed3a2a365ff0c8c87e397eedd.tar.gz
cpython-e548f5a0018fb44ed3a2a365ff0c8c87e397eedd.tar.bz2
#11985: merge with 3.1.
-rwxr-xr-xLib/platform.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index abe917a..967491a 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1417,9 +1417,10 @@ def python_implementation():
""" Returns a string identifying the Python implementation.
Currently, the following implementations are identified:
- 'CPython' (C implementation of Python),
- 'IronPython' (.NET implementation of Python),
- 'Jython' (Java implementation of Python).
+ 'CPython' (C implementation of Python),
+ 'IronPython' (.NET implementation of Python),
+ 'Jython' (Java implementation of Python),
+ 'PyPy' (Python implementation of Python).
"""
return _sys_version()[0]