diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-05-04 15:39:59 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-05-04 15:39:59 (GMT) |
| commit | 2c173bad9d8382db7dd1545642cb557e1cf9813e (patch) | |
| tree | b1fa08b4e28b0a0a16a40f7848ba6b96694218b2 /Lib/platform.py | |
| parent | 6d3c9a6893c0ba7e1f48534dfd2664d76bea7570 (diff) | |
| parent | e548f5a0018fb44ed3a2a365ff0c8c87e397eedd (diff) | |
| download | cpython-2c173bad9d8382db7dd1545642cb557e1cf9813e.zip cpython-2c173bad9d8382db7dd1545642cb557e1cf9813e.tar.gz cpython-2c173bad9d8382db7dd1545642cb557e1cf9813e.tar.bz2 | |
#11985: merge with 3.2.
Diffstat (limited to 'Lib/platform.py')
| -rwxr-xr-x | Lib/platform.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/platform.py b/Lib/platform.py index 75bc5f3..1e4abe6 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -1336,9 +1336,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] |