summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorniemeyer <>2004-05-13 00:44:46 +0000
committerniemeyer <>2004-05-13 00:44:46 +0000
commit52373856e12ad02b38c6f231129d8917096ab445 (patch)
tree58f69850e7d05824a660c9fa47aad3e873202f22
parent91a8c3dedafcf3068a71f845105cabeb8d23b90b (diff)
downloaddateutil-52373856e12ad02b38c6f231129d8917096ab445.tar.gz
- Sort exdate and rdate before iterating over them, so that it's
not necessary to sort them before adding to the rruleset (thanks to Nicholas Piper). - Fixing minor bug in relativedelta documentation.
-rw-r--r--dateutil/relativedelta.py2
-rw-r--r--dateutil/rrule.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/dateutil/relativedelta.py b/dateutil/relativedelta.py
index 4171d1a..212c474 100644
--- a/dateutil/relativedelta.py
+++ b/dateutil/relativedelta.py
@@ -56,7 +56,7 @@ first one is passing it two date/datetime classes:
And the other way is to use the following keyword arguments:
- year, month, day, hour, minute, seconds, microseconds:
+ year, month, day, hour, minute, second, microsecond:
Absolute information.
years, months, weeks, days, hours, minutes, seconds, microseconds:
diff --git a/dateutil/rrule.py b/dateutil/rrule.py
index f35c04d..3800acc 100644
--- a/dateutil/rrule.py
+++ b/dateutil/rrule.py
@@ -846,11 +846,13 @@ class rruleset(rrulebase):
def _iter(self):
rlist = []
+ self._rdate.sort()
self._genitem(rlist, iter(self._rdate).next)
for gen in [iter(x).next for x in self._rrule]:
self._genitem(rlist, gen)
rlist.sort()
exlist = []
+ self._exdate.sort()
self._genitem(exlist, iter(self._exdate).next)
for gen in [iter(x).next for x in self._exrule]:
self._genitem(exlist, gen)