Ticket #17937: timezone.diff

django/utils/timezone.py

@@ -3 +3 @@
 This module uses pytz when it's available and fallbacks when it isn't.
 """
 
-from datetime import datetime, timedelta, tzinfo
+from datetime import date, datetime, timedelta, tzinfo
 from threading import local
 import time as _time
 
@@ -248 +248 @@
 
     The logic is described in Python's docs:
     http://docs.python.org/library/datetime.html#datetime.tzinfo
+
+    Objects of the date type are always naive.
     """
-    return value.tzinfo is not None and value.tzinfo.utcoffset(value) is not None
+    if isinstance(value, date):
+        return False
+    else:
+        return value.tzinfo is not None and value.tzinfo.utcoffset(value) is not None
 
 def is_naive(value):
     """
@@ -257 +262 @@
 
     The logic is described in Python's docs:
     http://docs.python.org/library/datetime.html#datetime.tzinfo
+
+    Objects of the date type are always naive.
     """
-    return value.tzinfo is None or value.tzinfo.utcoffset(value) is None
+    if isinstance(value, date):
+        return True
+    else:
+        return value.tzinfo is None or value.tzinfo.utcoffset(value) is None
 
 def make_aware(value, timezone):
     """