Disallow : as microsecond separator for both implementations

Author: donBarbos

Lib/_pydatetime.py

@@ -404,7 +404,7 @@ def _parse_isoformat_date(dtstr):
 
 
 def _parse_hh_mm_ss_ff(tstr):
-    # Parses things of the form HH[:?MM[:?SS[{.,:}fff[fff]]]]
+    # Parses things of the form HH[:?MM[:?SS[{.,}fff[fff]]]]
     len_str = len(tstr)
 
     time_comps = [0, 0, 0, 0]
@@ -430,7 +430,7 @@ def _parse_hh_mm_ss_ff(tstr):
         pos += has_sep
 
     if pos < len_str:
-        if tstr[pos] not in '.,:':
+        if tstr[pos] not in '.,':
             raise ValueError("Invalid microsecond separator")
         else:
             pos += 1

Lib/test/datetimetester.py

@@ -3534,6 +3534,7 @@ def test_fromisoformat_fails_datetime(self):
             '2009-13-01T24:00:00.000000',  # Month is invalid before wrapping due to 24:00
             '9999-12-31T24:00:00.000000',  # Year is invalid after wrapping due to 24:00
             '2009-04-19T12:30Z12:00',      # Extra time zone info after Z
+            '2009-04-19T12:30:45:334034',  # Invalid microsecond separator
         ]
 
         for bad_str in bad_strs:
@@ -4660,7 +4661,6 @@ def test_fromisoformat_time_examples(self):
             ('000000.000000', self.theclass(0, 0)),
             ('00:00:00.000000', self.theclass(0, 0)),
             ('00:00:00,100000', self.theclass(0, 0, 0, 100000)),
-            ('00:00:00:100000', self.theclass(0, 0, 0, 100000)),
             ('1200', self.theclass(12, 0)),
             ('12:00', self.theclass(12, 0)),
             ('120000', self.theclass(12, 0)),
@@ -4729,6 +4729,7 @@ def test_fromisoformat_fails(self):
             '12.5',                     # Decimal mark at end of hour
             '12:30,5',                  # Decimal mark at end of minute
             '12:30:45.123456Z12:00',    # Extra time zone info after Z
+            '12:30:45:334034',          # Invalid microsecond separator
         ]
 
         for bad_str in bad_strs:

Modules/_datetimemodule.c

@@ -1014,6 +1014,9 @@ parse_hh_mm_ss_ff(const char *tstr, const char *tstr_end, int *hour,
             return c != '\0';
         }
         else if (has_separator && (c == ':')) {
+            if (i == 2) {
+                return -4;  // Malformed microsecond separator
+            }
             continue;
         }
         else if (c == '.' || c == ',') {