break up timedata regex into multiple statements so it compiles for micropython

Author: BrianPugh

src/tomli/_parser.py

@@ -5,7 +5,9 @@
 from collections import namedtuple
 
 from ._re import (
-    RE_DATETIME,
+    RE_DATETIME_TIME,
+    RE_DATETIME_YMD,
+    RE_DATETIME_ZONE,
     RE_LOCALTIME,
     RE_NUMBER,
     match_to_datetime,
@@ -610,13 +612,22 @@ def parse_value(  # noqa: C901
         return parse_inline_table(src, pos, parse_float)
 
     # Dates and times
-    datetime_match = RE_DATETIME.match(src, pos)
-    if datetime_match:
+    datetime_ymd_match = RE_DATETIME_YMD.match(src, pos)
+    if datetime_ymd_match:
+        end = datetime_ymd_match.end()
+        datetime_time_match = RE_DATETIME_TIME.match(src, datetime_ymd_match.end())
+        if datetime_time_match:
+            end = datetime_time_match.end()
+            datetime_zone_match = RE_DATETIME_ZONE.match(src, datetime_time_match.end())
+            if datetime_zone_match:
+                end = datetime_zone_match.end()
+        else:
+            datetime_zone_match = None
         try:
-            datetime_obj = match_to_datetime(datetime_match)
+            datetime_obj = match_to_datetime(datetime_ymd_match, datetime_time_match, datetime_zone_match)
         except ValueError as e:
             raise suffixed_err(src, pos, "Invalid date or datetime") from e
-        return datetime_match.end(), datetime_obj
+        return end, datetime_obj
     localtime_match = RE_LOCALTIME.match(src, pos)
     if localtime_match:
         return localtime_match.end(), match_to_localtime(localtime_match)

src/tomli/_re.py

@@ -11,34 +11,55 @@
 
 )
 RE_LOCALTIME = re.compile(r"([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])(?:\.([0-9]{1,6})[0-9]*)?")
-RE_DATETIME = re.compile(
-    # Currently the last group is too long for micropython (>127 bytes)
-    r"""([\d][\d][\d][\d])-(0[1-9]|1[0-2])-(0[1-9]|[12][\d]|3[01])([Tt ]([01][\d]|2[0-3]):([0-5][\d]):([0-5][\d])(\.([\d][\d]?[\d]?[\d]?[\d]?[\d]?)[\d]*)?(([Zz])|([+-])([01][\d]|2[0-3]):([0-5][\d]))?)?"""
+
+RE_DATETIME_YMD = re.compile(r"""([\d][\d][\d][\d])-(0[1-9]|1[0-2])-(0[1-9]|[12][\d]|3[01])""")
+RE_DATETIME_TIME = re.compile(
+    r"""([Tt ]([01][\d]|2[0-3]):([0-5][\d]):([0-5][\d])(\.([\d][\d]?[\d]?[\d]?[\d]?[\d]?)[\d]*)?)?"""
 )
+RE_DATETIME_ZONE = re.compile(r"(([Zz])|([+-])([01][\d]|2[0-3]):([0-5][\d]))?")
 
 
-def match_to_datetime(match):
+def match_to_datetime(ymd_match, time_match, zone_match):
     """Convert a `RE_DATETIME` match to `datetime.datetime` or `datetime.date`.
 
     Raises ValueError if the match does not correspond to a valid date
     or datetime.
     """
     (
-        year_str,  # 1
-        month_str,  # 2
-        day_str,  # 3
-        _,
-        hour_str,  # 4
-        minute_str,  # 5
-        sec_str,  # 6
-        _,
-        micros_str,  # 7
-        _,
-        zulu_time,  # 8
-        offset_sign_str,  # 9
-        offset_hour_str,  # 10
-        offset_minute_str,  # 11
-    ) = match.groups()
+        year_str,
+        month_str,
+        day_str,
+    ) = ymd_match.groups()
+
+    if time_match:
+        (
+            _,
+            hour_str,
+            minute_str,
+            sec_str,
+            _,
+            micros_str,
+        ) = time_match.groups()
+    else:
+        hour_str = None
+        minute_str = None
+        sec_str = None
+        micros_str = None
+
+    if zone_match:
+        (
+            _,
+            zulu_time,
+            offset_sign_str,
+            offset_hour_str,
+            offset_minute_str,
+        ) = zone_match.groups()
+    else:
+        zulu_time = None
+        offset_sign_str = None
+        offset_hour_str = None
+        offset_minute_str = None
+
     year, month, day = int(year_str), int(month_str), int(day_str)
     if hour_str is None:
         return date(year, month, day)