#11985: merge with 3.2.

d52f6143 · Ezio Melotti · d869f8c7 · 937d0116 · d52f6143
Commit d52f6143 authored May 04, 2011 by Ezio Melotti
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

Lib/platform.py Lib/platform.py +4 -3

No files found.
--- 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]