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

ezio.melotti python-checkins at python.org
Wed May 4 17:40:17 CEST 2011


http://hg.python.org/cpython/rev/cc7342b4e59d
changeset:   69829:cc7342b4e59d
branch:      3.2
parent:      69816:03d511dec224
parent:      69828:7bf9d7ae6c94
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed May 04 18:39:29 2011 +0300
summary:
  #11985: merge with 3.1.

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
@@ -1417,9 +1417,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


More information about the Python-checkins mailing list