Ticket #4428: datetimefield_millisecond.patch

fields.py

@@ -271 +271 @@
     '%m/%d/%y',              # '10/25/06'
 )
 
+
+def timeparse(t, format):
+    """Parse a time string that might contain fractions of a second.
+     
+    Fractional seconds are supported using a fragile, miserable hack.
+    Given a time string like '02:03:04.234234' and a format string of
+    '%H:%M:%S', time.strptime() will raise a ValueError with this
+    message: 'unconverted data remains: .234234'. If %S is in the
+    format string and the ValueError matches as above, a datetime
+    object will be created from the part that matches and the
+    microseconds in the time string.
+     
+    Found at: http://www.thescripts.com/forum/thread506538.html
+    """
+    
+    try:
+        return datetime.datetime(*time.strptime(t, format)[0:6])
+    except ValueError, msg:
+        if "%S" in format:
+            msg = str(msg)
+            regex_types = (
+                r"unconverted data remains: \.([0-9]{1,6})$",
+                r"unconverted data remains: \,([0-9]{3,3})$"
+            )
+            
+            for regex in regex_types:
+                mat = re.match(regex, msg)
+
+                if mat is not None:
+                    # fractional seconds are present - this is the style
+                    # used by datetime's isoformat() method
+                    frac = "." + mat.group(1)
+                    t = t[:-len(frac)]
+                    t = datetime.datetime(*time.strptime(t, format)[0:6])
+                    microsecond = int(float(frac)*1e6)
+                    return t.replace(microsecond=microsecond)
+        raise
+
 class DateTimeField(Field):
     def __init__(self, input_formats=None, *args, **kwargs):
         super(DateTimeField, self).__init__(*args, **kwargs)
@@ -290 +328 @@
             return datetime.datetime(value.year, value.month, value.day)
         for format in self.input_formats:
             try:
-                return datetime.datetime(*time.strptime(value, format)[:6])
+                return timeparse(value, format)
             except ValueError:
                 continue
         raise ValidationError(gettext(u'Enter a valid date/time.'))