From 11b3535280acccca9a242d3275532cda45eb5ba4 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Tue, 26 Sep 2006 23:38:24 +0000
Subject: Make the error message for when the time data and format do not match
clearer.
---
Lib/_strptime.py | 2 +-
Misc/NEWS | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Lib/_strptime.py b/Lib/_strptime.py
index ce8525b..3fb5602 100644
--- a/Lib/_strptime.py
+++ b/Lib/_strptime.py
@@ -306,7 +306,7 @@ def strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
_cache_lock.release()
found = format_regex.match(data_string)
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))
if len(data_string) != found.end():
raise ValueError("unconverted data remains: %s" %
diff --git a/Misc/NEWS b/Misc/NEWS
index c1a3a6c..b7c69c1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -56,6 +56,9 @@ Core and builtins
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
being raised when print_exc() was called without an exception set.
In version 2.4, this printed "None", restored that behavior.
--
cgit v0.12