summaryrefslogtreecommitdiffstats
path: root/Lib/_strptime.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-04-03 23:16:27 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-04-03 23:16:27 (GMT)
commitd57f0476659151ba866c42ac6bb5b006c2e1bb55 (patch)
tree9997a8890094beacd24f952ac5c9d1ed8da5afd3 /Lib/_strptime.py
parent8fc16b37ea229ff7090fa6fb23c403e91a0b25a5 (diff)
parent0f38908684505905fd0890f4effbe6f683b39954 (diff)
downloadcpython-d57f0476659151ba866c42ac6bb5b006c2e1bb55.zip
cpython-d57f0476659151ba866c42ac6bb5b006c2e1bb55.tar.gz
cpython-d57f0476659151ba866c42ac6bb5b006c2e1bb55.tar.bz2
#17572: merge with 3.3.
Diffstat (limited to 'Lib/_strptime.py')
-rw-r--r--Lib/_strptime.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/_strptime.py b/Lib/_strptime.py
index 3ecfc2a..7520919 100644
--- a/Lib/_strptime.py
+++ b/Lib/_strptime.py
@@ -326,7 +326,7 @@ def _strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
bad_directive = "%"
del err
raise ValueError("'%s' is a bad directive in format '%s'" %
- (bad_directive, format))
+ (bad_directive, format)) from None
# IndexError only occurs when the format string is "%"
except IndexError:
raise ValueError("stray %% in format '%s'" % format)