[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

Sun Mar 20 21:29:27 EDT 2016

https://hg.python.org/cpython/rev/ec5516d14024
changeset: 100633:ec5516d14024
parent: 100631:701b2f8e206c
parent: 100632:c7071c9b8c33
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sun Mar 20 21:18:54 2016 -0400
summary:
 Merge with 3.5
files:
 Doc/library/functions.rst | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1079,8 +1079,8 @@
 
 Given a string representing one Unicode character, return an integer
 representing the Unicode code point of that character. For example,
- ``ord('a')`` returns the integer ``97`` and ``ord('ν')`` returns ``957``.
- This is the inverse of :func:`chr`.
+ ``ord('a')`` returns the integer ``97`` and ``ord('€')`` (Euro sign)
+ returns ``8364``. This is the inverse of :func:`chr`.
 
 
 .. function:: pow(x, y[, z])
-- 
Repository URL: https://hg.python.org/cpython
