Issue #29193: A format string argument for string.Formatter.format()

is now positional-only.
This commit is contained in:
Serhiy Storchaka 2017-01-13 09:10:51 +02:00
parent b37f3f6e6b
commit 009b0a1fac
5 changed files with 16 additions and 14 deletions

View file

@ -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):