diff options
| author | Raymond Hettinger <python@rcn.com> | 2017-02-06 07:15:57 -0800 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2017-02-06 07:15:57 -0800 |
| commit | 826745ba953b4ef23462fb0bc2d7b3db23b51d89 (patch) | |
| tree | 7789cc87df07c2786c40e6888cbb532a94ce6334 /Lib/string.py | |
| parent | 95b272b4e0d5438a12702e51e05d03f5a5a8e505 (diff) | |
| parent | 515f1cf20f4e9656b1bcda236bad8ed0e33770f0 (diff) | |
| download | cpython-826745ba953b4ef23462fb0bc2d7b3db23b51d89.tar.gz | |
merge
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): |