Kaydet (Commit) 11b35352 authored tarafından Brett Cannon's avatar Brett Cannon

Make the error message for when the time data and format do not match clearer.

üst c839c2f2
...@@ -306,7 +306,7 @@ def strptime(data_string, format="%a %b %d %H:%M:%S %Y"): ...@@ -306,7 +306,7 @@ def strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
_cache_lock.release() _cache_lock.release()
found = format_regex.match(data_string) found = format_regex.match(data_string)
if not found: if not found:
raise ValueError("time data did not match format: data=%s fmt=%s" % raise ValueError("time data %r does not match format %r" %
(data_string, format)) (data_string, format))
if len(data_string) != found.end(): if len(data_string) != found.end():
raise ValueError("unconverted data remains: %s" % raise ValueError("unconverted data remains: %s" %
......
...@@ -56,6 +56,9 @@ Core and builtins ...@@ -56,6 +56,9 @@ Core and builtins
Library Library
------- -------
- Made the error message for time.strptime when the data data and format do
match be more clear.
- Fix a bug in traceback.format_exception_only() that led to an error - Fix a bug in traceback.format_exception_only() that led to an error
being raised when print_exc() was called without an exception set. being raised when print_exc() was called without an exception set.
In version 2.4, this printed "None", restored that behavior. In version 2.4, this printed "None", restored that behavior.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment