From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 13 Jan 2017 07:10:51 +0000 (+0200)
Subject: Issue #29193: A format string argument for string.Formatter.format()
X-Git-Tag: v3.7.0a1~1568
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=009b0a1face9c16b608b3cd18df8c88632006ae1;p=python

Issue #29193: A format string argument for string.Formatter.format()
is now positional-only.
---

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index a0977b6461..03eaf3b9cd 100644
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -95,9 +95,9 @@ implementation as the built-in :meth:`~str.format` method.
       an arbitrary set of positional and keyword arguments.
       It is just a wrapper that calls :meth:`vformat`.
 
-      .. deprecated:: 3.5
-         Passing a format string as keyword argument *format_string* has been
-         deprecated.
+      .. versionchanged:: 3.7
+         A format string argument is now :ref:`positional-only
+         <positional-only_parameter>`.
 
    .. method:: vformat(format_string, args, kwargs)
 
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index a2e6422793..c4814e2706 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -147,3 +147,9 @@ This section lists previously described changes and other bugfixes
 that may require changes to your code.
 
 
+Changes in the Python API
+-------------------------
+
+* A format string argument for :meth:`string.Formatter.format`
+  is now :ref:`positional-only <positional-only_parameter>`.
+  (Contributed by Serhiy Storchaka in :issue:`29193`.)
diff --git a/Lib/string.py b/Lib/string.py
index c902007643..bc9508c1e6 100644
--- a/Lib/string.py
+++ b/Lib/string.py
@@ -175,14 +175,8 @@ class Formatter:
         try:
             format_string, *args = args # allow the "format_string" keyword be passed
         except ValueError:
-            if 'format_string' in kwargs:
-                format_string = kwargs.pop('format_string')
-                import warnings
-                warnings.warn("Passing 'format_string' as keyword argument is "
-                              "deprecated", DeprecationWarning, stacklevel=2)
-            else:
-                raise TypeError("format() missing 1 required positional "
-                                "argument: 'format_string'") from None
+            raise TypeError("format() missing 1 required positional "
+                            "argument: 'format_string'") from None
         return self.vformat(format_string, args, kwargs)
 
     def vformat(self, format_string, args, kwargs):
diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py
index 70439f85c8..a7b8aad8ab 100644
--- a/Lib/test/test_string.py
+++ b/Lib/test/test_string.py
@@ -48,9 +48,8 @@ class ModuleTest(unittest.TestCase):
         self.assertEqual(fmt.format("-{format_string}-", format_string='test'),
                          '-test-')
         self.assertRaises(KeyError, fmt.format, "-{format_string}-")
-        with self.assertWarnsRegex(DeprecationWarning, "format_string"):
-            self.assertEqual(fmt.format(arg='test', format_string="-{arg}-"),
-                             '-test-')
+        with self.assertRaisesRegex(TypeError, "format_string"):
+            fmt.format(format_string="-{arg}-", arg='test')
 
     def test_auto_numbering(self):
         fmt = string.Formatter()
diff --git a/Misc/NEWS b/Misc/NEWS
index 1f05889c88..484ee85517 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -212,6 +212,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #29193: A format string argument for string.Formatter.format()
+  is now positional-only.
+
 - Issue #29195: Removed support of deprecated undocumented keyword arguments
   in methods of regular expression objects.