Merge pull request #520 from NikEasY/master

refactored DURATION_REGEX

CHANGES.rst

@@ -6,7 +6,7 @@ Changelog
 
 Minor changes:
 
-- ...
+- Adjusted duration regex
 
 Breaking changes:
 

docs/credits.rst

@@ -67,6 +67,7 @@ icalendar contributors
 - Pronoy <lukex9442@gmail.com>
 - Abe Hanoka <abe@habet.dev>
 - `Natasha Mattson <https://github.com/natashamm`_
+- `NikEasY <https://github.com/NikEasY>`_
 
 Find out who contributed::
 

src/icalendar/prop.py

@@ -63,12 +63,9 @@
 import time as _time
 
 
-DATE_PART = r'(\d+)D'
-TIME_PART = r'T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?'
-DATETIME_PART = f'(?:{DATE_PART})?(?:{TIME_PART})?'
-WEEKS_PART = r'(\d+)W'
-DURATION_REGEX = re.compile(r'([-+]?)P(?:%s|%s)$'
-                            % (WEEKS_PART, DATETIME_PART))
+DURATION_REGEX = re.compile(r'([-+]?)P(?:(\d+)W)?(?:(\d+)D)?'
+                            r'(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?$')
+
 WEEKDAY_RULE = re.compile(r'(?P<signal>[+-]?)(?P<relative>[\d]?)'
                           r'(?P<weekday>[\w]{2})$')
 
@@ -475,22 +472,24 @@ def to_ical(self):
 
     @staticmethod
     def from_ical(ical):
-        try:
-            match = DURATION_REGEX.match(ical)
-            sign, weeks, days, hours, minutes, seconds = match.groups()
-            if weeks:
-                value = timedelta(weeks=int(weeks))
-            else:
-                value = timedelta(days=int(days or 0),
-                                  hours=int(hours or 0),
-                                  minutes=int(minutes or 0),
-                                  seconds=int(seconds or 0))
-            if sign == '-':
-                value = -value
-            return value
-        except Exception:
+        match = DURATION_REGEX.match(ical)
+        if not match:
             raise ValueError(f'Invalid iCalendar duration: {ical}')
 
+        sign, weeks, days, hours, minutes, seconds = match.groups()
+        value = timedelta(
+            weeks=int(weeks or 0),
+            days=int(days or 0),
+            hours=int(hours or 0),
+            minutes=int(minutes or 0),
+            seconds=int(seconds or 0)
+        )
+
+        if sign == '-':
+            value = -value
+
+        return value
+
 
 class vPeriod:
     """A precise period of time.