Adding documentation inside what's new in 3.7

plusminushalf · plusminushalf · commit 4e24a3f0843e · 2017-02-25T20:37:41.000+05:30
Fixed recommended CR changes
diff --git a/Doc/library/locale.rst b/Doc/library/locale.rst
@@ -371,12 +371,19 @@ The :mod:`locale` module defines the following exception and functions:
 
 .. function:: format_string(format, val, grouping=False, monetary=False)
 
+   Formats a number *val* according to the current :const:`LC_NUMERIC` setting.
+   The format follows the conventions of the ``%`` operator.  For floating point
+   values, the decimal point is modified if appropriate.  If *grouping* is true,
+   also takes the grouping into account.
+
+   If *monetary* is true, the conversion uses monetary thousands separator and
+   grouping strings.
+
    Processes formatting specifiers as in ``format % val``, but takes the current
    locale settings into account.
 
    .. versionchanged:: 3.7
    The *monetary* keyword parameter was added.
-   Replaces :meth:`format`.
 
 
 .. function:: currency(val, symbol=True, grouping=False, international=False)
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
@@ -158,6 +158,11 @@ API and Feature Removals
   Python 3.1, and has now been removed.  Use the :func:`~os.path.splitdrive`
   function instead.
 
+* Deprecated :meth:`format` from :mod:`locale`, use the :meth:`format_string`
+  instead. Added another argument *monetary* in :meth:`format_string` of
+  :mod:`locale`.
+   (Contributed by Garvit in :issue:`10379`.)
+
 
 Porting to Python 3.7
 =====================
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
@@ -199,11 +199,8 @@ def test_padding(self):
         self._test_format("%-10.f", 4200, grouping=0, out='4200'.ljust(10))
 
     def test_format_deprecation(self):
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always", DeprecationWarning)
+        with self.assertWarns(DeprecationWarning):
             locale.format("%-10.f", 4200, grouping=True)
-        for warning in w:
-            self.assertTrue(warning.category is DeprecationWarning)
 
     def test_complex_formatting(self):
         # Spaces in formatting string
