diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 16:46:53 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 16:46:53 -0800 |
| commit | b1a1742796fce8078f9f1f3d5e3161122fae3b0a (patch) | |
| tree | 89c863764481b7c7fbe645be42b16e1d35e92751 /Lib/string.py | |
| parent | 391ed6c73cb1964b57d0b538370a76d03d30511b (diff) | |
| parent | cf1f5444eb42a8dc252b295d3863288309996a5d (diff) | |
| download | cpython-b1a1742796fce8078f9f1f3d5e3161122fae3b0a.tar.gz | |
Merge from 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): |