diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:50 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:50 -0800 |
| commit | 3b0e4320092ac0504b6670cafaf0301b908c91fc (patch) | |
| tree | d3be1b6b844d61763bb366fa21ceed475e5703fd /Lib/string.py | |
| parent | b2fa705fd3887c326e811c418469c784353027f4 (diff) | |
| parent | f687fbcd73c14dfcbe086eb5cd94b298f1e81e72 (diff) | |
| download | cpython-3b0e4320092ac0504b6670cafaf0301b908c91fc.tar.gz | |
Issue #29392: Prevent crash when passing invalid arguments into msvcrt module.
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): |