[Python-checkins] cpython (merge 3.2 -> default): #11985: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/6b95bf39842f
changeset:   69830:6b95bf39842f
parent:      69826:d2a27006237b
parent:      69829:cc7342b4e59d
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed May 04 18:39:59 2011 +0300
summary:
  #11985: merge with 3.2.

files:
  Lib/platform.py |  7 ++++---
  1 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Lib/platform.py b/Lib/platform.py
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -1336,9 +1336,10 @@
     """ 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]

-- 
Repository URL: http://hg.python.org/cpython