From 9937b2b6b87d746d0632c0d706adf538d2f1cb8f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 25 Feb 2014 08:19:09 +0530 Subject: [PATCH] Fix test failing because of change in behavior of dateutil module --- src/calibre/db/tables.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/db/tables.py b/src/calibre/db/tables.py index 219f12a613..b106b0dbb0 100644 --- a/src/calibre/db/tables.py +++ b/src/calibre/db/tables.py @@ -24,6 +24,8 @@ def c_parse(val): # an int if isinstance(val, (int, float)): return datetime(int(val), 1, 3, tzinfo=utc_tz) + if val is None: + return UNDEFINED_DATE except: pass else: @@ -36,7 +38,7 @@ def c_parse(val): return ans try: return parse_date(val, as_utc=True, assume_utc=True) - except ValueError: + except (ValueError, TypeError): return UNDEFINED_DATE ONE_ONE, MANY_ONE, MANY_MANY = xrange(3)