pawelsocha
diff --git a/‎MySQLdb/times.py
Copy file name to clipboardExpand all lines: MySQLdb/times.py
+31-20Lines changed: 31 additions & 20 deletions b/‎MySQLdb/times.py
Copy file name to clipboardExpand all lines: MySQLdb/times.py
+31-20Lines changed: 31 additions & 20 deletions
diff --git a/‎tests/test_MySQLdb_times.py
Copy file name to clipboardExpand all lines: tests/test_MySQLdb_times.py
+3Lines changed: 3 additions & 0 deletions b/‎tests/test_MySQLdb_times.py
Copy file name to clipboardExpand all lines: tests/test_MySQLdb_times.py
+3Lines changed: 3 additions & 0 deletions
@@ -48,25 +48,32 @@ def format_TIMESTAMP(d):
 
 
 def DateTime_or_None(s):
-    if ' ' in s:
-        sep = ' '
-    elif 'T' in s:
-        sep = 'T'
-    else:
-        return Date_or_None(s)
-
     try:
-        d, t = s.split(sep, 1)
-        if '.' in t:
-            t, ms = t.split('.',1)
-            ms = ms.ljust(6, '0')
+        if len(s) < 11:
+            return Date_or_None(s)
+
+        micros = s[20:]
+
+        if len(micros) == 0:
+            # 12:00:00
+            micros = 0
+        elif len(micros) < 7:
+            # 12:00:00.123456
+            micros = int(micros) * 10 ** (6 - len(micros))
         else:
-            ms = 0
-        return datetime(*[ int(x) for x in d.split('-')+t.split(':')+[ms] ])
-    except (SystemExit, KeyboardInterrupt):
-        raise  # pragma: no cover
-    except:
-        return Date_or_None(s)
+            return None
+
+        return datetime(
+            int(s[:4]),          # year
+            int(s[5:7]),         # month
+            int(s[8:10]),        # day
+            int(s[11:13] or 0),  # hour
+            int(s[14:16] or 0),  # minute
+            int(s[17:19] or 0),  # second
+            micros,              # microsecond
+        )
+    except ValueError:
+        return None
 
 def TimeDelta_or_None(s):
     try:
@@ -107,14 +114,18 @@ def Time_or_None(s):
 
 def Date_or_None(s):
     try:
-        return date(*[ int(x) for x in s.split('-',2)])
-    except (TypeError, ValueError):
+        return date(
+            int(s[:4]),    # year
+            int(s[5:7]),   # month
+            int(s[8:10]),  # day
+        )
+    except ValueError:
         return None
 
 def DateTime2literal(d, c):
     """Format a DateTime object as an ISO timestamp."""
     return string_literal(format_TIMESTAMP(d), c)
-    
+
 def DateTimeDelta2literal(d, c):
     """Format a DateTimeDelta object as a time."""
     return string_literal(format_TIMEDELTA(d),c)
 
@@ -19,6 +19,7 @@ def test_date_or_none(self):
         assert times.Date_or_None('fail') is None
         assert times.Date_or_None('2015-12') is None
         assert times.Date_or_None('2015-12-40') is None
+        assert times.Date_or_None('0000-00-00') is None
 
     def test_time_or_none(self):
         assert times.Time_or_None('00:00:00') == time(0, 0)
@@ -44,6 +45,8 @@ def test_datetime_or_none(self):
 
         assert times.DateTime_or_None('') is None
         assert times.DateTime_or_None('fail') is None
+        assert times.DateTime_or_None('0000-00-00 00:00:00') is None
+        assert times.DateTime_or_None('0000-00-00 00:00:00.000000') is None
         assert times.DateTime_or_None('2015-12-13T01:02:03.123456789') is None
 
     def test_timedelta_or_none(self):