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

[senthil.kumaran]

https://hg.python.org/cpython/rev/ad5b079565ad
changeset:   100956:ad5b079565ad
parent:      100952:a04455866ec7
parent:      100955:2b35ef6a9853
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Tue Apr 12 23:15:44 2016 -0700
summary:
  merge 3.5.

[minor] - Correct the docstring of locale.str. Patch by poleto.

files:
  Lib/locale.py |  17 ++++++++---------
  1 files changed, 8 insertions(+), 9 deletions(-)


diff --git a/Lib/locale.py b/Lib/locale.py
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -1,13 +1,12 @@
-""" Locale support.
+"""Locale support module.
 
-    The module provides low-level access to the C lib's locale APIs
-    and adds high level number formatting APIs as well as a locale
-    aliasing engine to complement these.
+The module provides low-level access to the C lib's locale APIs and adds high
+level number formatting APIs as well as a locale aliasing engine to complement
+these.
 
-    The aliasing engine includes support for many commonly used locale
-    names and maps them to values suitable for passing to the C lib's
-    setlocale() function. It also includes default encodings for all
-    supported locale names.
+The aliasing engine includes support for many commonly used locale names and
+maps them to values suitable for passing to the C lib's setlocale() function. It
+also includes default encodings for all supported locale names.
 
 """
 
@@ -298,7 +297,7 @@
     return s.replace('<', '').replace('>', '')
 
 def str(val):
-    """Convert float to integer, taking the locale into account."""
+    """Convert float to string, taking the locale into account."""
     return format("%.12g", val)
 
 def delocalize(string):

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