PyMySQL
diff --git a/‎pymysql/converters.py
Lines changed: 9 additions & 4 deletions b/‎pymysql/converters.py
Lines changed: 9 additions & 4 deletions
diff --git a/‎pymysql/tests/test_converters.py
Lines changed: 11 additions & 0 deletions b/‎pymysql/tests/test_converters.py
Lines changed: 11 additions & 0 deletions
@@ -145,6 +145,11 @@ def escape_date(obj, mapping=None):
 def escape_struct_time(obj, mapping=None):
     return escape_datetime(datetime.datetime(*obj[:6]))
 
+def _convert_second_fraction(s):
+    # Pad zeros to ensure the fraction length in microseconds
+    s = s.ljust(6, '0')
+    return int(s[:6])
+
 def convert_datetime(obj):
     """Returns a DATETIME or TIMESTAMP column value as a datetime object:
 
@@ -175,7 +180,7 @@ def convert_datetime(obj):
         usecs = '0'
         if '.' in hms:
             hms, usecs = hms.split('.')
-        usecs = float('0.' + usecs) * 1e6
+        usecs = _convert_second_fraction(usecs)
         return datetime.datetime(*[ int(x) for x in ymd.split('-')+hms.split(':')+[usecs] ])
     except ValueError:
         return convert_date(obj)
@@ -204,7 +209,7 @@ def convert_timedelta(obj):
         microseconds = 0
         if "." in obj:
             (obj, tail) = obj.split('.')
-            microseconds = float('0.' + tail) * 1e6
+            microseconds = _convert_second_fraction(tail)
         hours, minutes, seconds = obj.split(':')
         negate = 1
         if hours.startswith("-"):
@@ -248,7 +253,7 @@ def convert_time(obj):
         microseconds = 0
         if "." in obj:
             (obj, tail) = obj.split('.')
-            microseconds = float('0.' + tail) * 1e6
+            microseconds = _convert_second_fraction(tail)
         hours, minutes, seconds = obj.split(':')
         return datetime.time(hour=int(hours), minute=int(minutes),
                              second=int(seconds), microsecond=int(microseconds))
@@ -324,7 +329,7 @@ def through(x):
 #def convert_bit(b):
 #    b = "\x00" * (8 - len(b)) + b # pad w/ zeroes
 #    return struct.unpack(">Q", b)[0]
-#    
+#
 #     the snippet above is right, but MySQLdb doesn't process bits,
 #     so we shouldn't either
 convert_bit = through
 
@@ -1,3 +1,4 @@
+import datetime
 from unittest import TestCase
 
 from pymysql._compat import PY2
@@ -21,3 +22,13 @@ def test_escape_string_bytes(self):
                 converters.escape_string(b"foo\nbar"),
                 b"foo\\nbar"
             )
+
+    def test_convert_datetime_with_fsp(self):
+        expected = datetime.datetime(2007, 2, 24, 23, 6, 20, 511581)
+        dt = converters.convert_datetime('2007-02-24T23:06:20.511581')
+        self.assertEqual(dt, expected)
+
+    def test_convert_time_with_fsp(self):
+        expected = datetime.time(23, 6, 20, 511581)
+        time_obj = converters.convert_time('23:06:20.511581')
+        self.assertEqual(time_obj, expected)