diff options
| author | Larry Hastings <larry@hastings.org> | 2013-11-24 22:05:57 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2013-11-24 22:05:57 (GMT) |
| commit | 99e101013fa36da37e47a5a18b5a62d621b0efb9 (patch) | |
| tree | f603004433e242a1eb26573cd9ec54846229d071 /Lib/_strptime.py | |
| parent | d34b620cc3b8b2326b511f98b0ca439ad97b83b8 (diff) | |
| parent | 2480c2ed593a164fe3a4821a13d5867a0a7102ed (diff) | |
| download | cpython-99e101013fa36da37e47a5a18b5a62d621b0efb9.zip cpython-99e101013fa36da37e47a5a18b5a62d621b0efb9.tar.gz cpython-99e101013fa36da37e47a5a18b5a62d621b0efb9.tar.bz2 | |
Merged 3.4.0b1 release head back into trunk.
Diffstat (limited to 'Lib/_strptime.py')
| -rw-r--r-- | Lib/_strptime.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/_strptime.py b/Lib/_strptime.py index 3884a67..d101c6d 100644 --- a/Lib/_strptime.py +++ b/Lib/_strptime.py @@ -329,7 +329,7 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"): (bad_directive, format)) from None # IndexError only occurs when the format string is "%" except IndexError: - raise ValueError("stray %% in format '%s'" % format) + raise ValueError("stray %% in format '%s'" % format) from None _regex_cache[format] = format_regex found = format_regex.match(data_string) if not found: |