diff options
| author | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:18:39 -0800 |
|---|---|---|
| committer | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:18:39 -0800 |
| commit | 731cca110f376cdbaffb536e42d6c9d6da574fa8 (patch) | |
| tree | 9cb95caf6f8b933115820bf699725d9cd600d2df /Lib/string.py | |
| parent | da79bcf8ac7ae72218ab023e1ed54390bc1a3a27 (diff) | |
| parent | c8102f4d974669f4c5e4ca7bcd73292a1ac5bcbf (diff) | |
| download | cpython-731cca110f376cdbaffb536e42d6c9d6da574fa8.tar.gz | |
Issue #29371: merge with 3.6
Diffstat (limited to 'Lib/string.py')
| -rw-r--r-- | Lib/string.py | 10 |
1 files changed, 2 insertions, 8 deletions
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): |