Ticket #7801: datetime_date_time_field_fix_8156.diff

django/db/models/fields/__init__.py

@@ -548 +548 @@
         return [oldforms.CommaSeparatedIntegerField]
 
 class DateField(Field):
+    from django.db.models.fields.subclassing import SubfieldBase 
+    __metaclass__ = SubfieldBase 
+        
     empty_strings_allowed = False
     def __init__(self, verbose_name=None, name=None, auto_now=False, auto_now_add=False, **kwargs):
         self.auto_now, self.auto_now_add = auto_now, auto_now_add
@@ -617 +620 @@
         return super(DateField, self).formfield(**defaults)
 
 class DateTimeField(DateField):
+    from django.db.models.fields.subclassing import SubfieldBase 
+    __metaclass__ = SubfieldBase 
+
     def get_internal_type(self):
         return "DateTimeField"
 
@@ -1106 +1112 @@
         return super(TextField, self).formfield(**defaults)
 
 class TimeField(Field):
+    from django.db.models.fields.subclassing import SubfieldBase 
+    __metaclass__ = SubfieldBase 
+
     empty_strings_allowed = False
     def __init__(self, verbose_name=None, name=None, auto_now=False, auto_now_add=False, **kwargs):
         self.auto_now, self.auto_now_add = auto_now, auto_now_add
@@ -1121 +1130 @@
             return None
         if isinstance(value, datetime.time):
             return value
+        if isinstance(value, datetime.datetime):
+            return value.time()
 
         # Attempt to parse a datetime:
         value = smart_str(value)