Merge pull request #116 from Unrud/patch-3

RRULE: Fix VTODO without DTSTART
skarim · Jul 8, 2018 · 4b72717 · 4b72717
2 parents 9bbc631 + 25379b7
commit 4b72717
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/vobject/icalendar.py b/vobject/icalendar.py
@@ -414,7 +414,21 @@ def getrruleset(self, addRDate=False):
                 if addfunc is None:
                     addfunc = getattr(rruleset, name)
 
-                dtstart = self.dtstart.value
+                try:
+                    dtstart = self.dtstart.value
+                except (AttributeError, KeyError):
+                    # Special for VTODO - try DUE property instead
+                    try:
+                        if self.name == "VTODO":
+                            dtstart = self.due.value
+                        else:
+                            # if there's no dtstart, just return None
+                            logging.error('failed to get dtstart with VTODO')
+                            return None
+                    except (AttributeError, KeyError):
+                        # if there's no due, just return None
+                        logging.error('failed to find DUE at all.')
+                        return None
 
                 if name in DATENAMES:
                     if type(line.value[0]) == datetime.datetime:
@@ -426,22 +440,6 @@ def getrruleset(self, addRDate=False):
                         # ignore RDATEs with PERIOD values for now
                         pass
                 elif name in RULENAMES:
-                    try:
-                        dtstart = self.dtstart.value
-                    except (AttributeError, KeyError):
-                        # Special for VTODO - try DUE property instead
-                        try:
-                            if self.name == "VTODO":
-                                dtstart = self.due.value
-                            else:
-                                # if there's no dtstart, just return None
-                                logging.error('failed to get dtstart with VTODO')
-                                return None
-                        except (AttributeError, KeyError):
-                            # if there's no due, just return None
-                            logging.error('failed to find DUE at all.')
-                            return None
-
                     # a Ruby iCalendar library escapes semi-colons in rrules,
                     # so also remove any backslashes
                     value = line.value.replace('\\', '')