Merge pull request #85 from eventable/rdates

fix some getrruleset() bugs
skarim · Jun 26, 2017 · 1e90b7d · 1e90b7d
2 parents d437ef8 + c3e2272
commit 1e90b7d
Showing 1 changed file with 29 additions and 17 deletions.
diff --git a/vobject/icalendar.py b/vobject/icalendar.py
@@ -398,7 +398,7 @@ def getrruleset(self, addRDate=False):
         Get an rruleset created from self.
 
         If addRDate is True, add an RDATE for dtstart if it's not included in
-        an RRULE, and count is decremented if it exists.
+        an RRULE or RDATE, and count is decremented if it exists.
 
         Note that for rules which don't match DTSTART, DTSTART may not appear
         in list(rruleset), although it should.  By default, an RDATE is not
@@ -415,9 +415,11 @@ def getrruleset(self, addRDate=False):
                 if addfunc is None:
                     addfunc = getattr(rruleset, name)
 
+                dtstart = self.dtstart.value
+
                 if name in DATENAMES:
                     if type(line.value[0]) == datetime.datetime:
-                        map(addfunc, line.value)
+                        list(map(addfunc, line.value))
                     elif type(line.value[0]) == datetime.date:
                         for dt in line.value:
                             addfunc(datetime.datetime(dt.year, dt.month, dt.day))
@@ -492,26 +494,36 @@ def getrruleset(self, addRDate=False):
                     # add the rrule or exrule to the rruleset
                     addfunc(rule)
 
-                    if name == 'rrule' and addRDate:
-                        try:
-                            # dateutils does not work with all-day
-                            # (datetime.date) items so we need to convert to a
-                            # datetime.datetime (which is what dateutils
-                            # does internally)
-                            if not isinstance(dtstart, datetime.datetime):
-                                adddtstart = datetime.datetime.fromordinal(dtstart.toordinal())
-                            else:
-                                adddtstart = dtstart
+                if (name == 'rrule' or name == 'rdate') and addRDate:
+                    # rlist = rruleset._rrule if name == 'rrule' else rruleset._rdate
+                    try:
+                        # dateutils does not work with all-day
+                        # (datetime.date) items so we need to convert to a
+                        # datetime.datetime (which is what dateutils
+                        # does internally)
+                        if not isinstance(dtstart, datetime.datetime):
+                            adddtstart = datetime.datetime.fromordinal(dtstart.toordinal())
+                        else:
+                            adddtstart = dtstart
+
+                        if name == 'rrule':
                             if rruleset._rrule[-1][0] != adddtstart:
                                 rruleset.rdate(adddtstart)
                                 added = True
+                                if rruleset._rrule[-1]._count is not None:
+                                    rruleset._rrule[-1]._count -= 1
                             else:
                                 added = False
-                        except IndexError:
-                            # it's conceivable that an rrule has 0 datetimes
-                            added = False
-                        if added and rruleset._rrule[-1]._count is not None:
-                            rruleset._rrule[-1]._count -= 1
+                        elif name == 'rdate':
+                            if rruleset._rdate[0] != adddtstart:
+                                rruleset.rdate(adddtstart)
+                                added = True
+                            else:
+                                added = False
+                    except IndexError:
+                        # it's conceivable that an rrule has 0 datetimes
+                        added = False
+
         return rruleset
 
     def setrruleset(self, rruleset):