[CalendarServer-changes] [15020] PyCalendar/trunk/src/pycalendar/icalendar
source_changes at macosforge.org
source_changes at macosforge.org
Fri Jul 31 19:37:47 PDT 2015
Revision: 15020
http://trac.calendarserver.org//changeset/15020
Author: cdaboo at apple.com
Date: 2015-07-31 19:37:47 -0700 (Fri, 31 Jul 2015)
Log Message:
-----------
Fix issue with monthly,byday/bysetpos rrule expansion. Re-factor tests to make it easier to add new rules for testing. Fix a source file encoding issue.
Modified Paths:
--------------
PyCalendar/trunk/src/pycalendar/icalendar/recurrence.py
PyCalendar/trunk/src/pycalendar/icalendar/tests/test_json.py
PyCalendar/trunk/src/pycalendar/icalendar/tests/test_recurrence.py
Added Paths:
-----------
PyCalendar/trunk/src/pycalendar/icalendar/tests/rrule_examples.json
Modified: PyCalendar/trunk/src/pycalendar/icalendar/recurrence.py
===================================================================
--- PyCalendar/trunk/src/pycalendar/icalendar/recurrence.py 2015-07-31 19:11:05 UTC (rev 15019)
+++ PyCalendar/trunk/src/pycalendar/icalendar/recurrence.py 2015-08-01 02:37:47 UTC (rev 15020)
@@ -1007,9 +1007,6 @@
elif self.mFreq == definitions.eRecurrence_YEARLY:
self.generateYearlySet(start_iter, set_items)
- # Ignore if it is invalid
- set_items = filter(lambda x: not x.invalid(), set_items)
-
# Always sort the set as BYxxx rules may not be sorted
# set_items.sort(cmp=DateTime.sort)
set_items.sort(key=lambda x: x.getPosixTime())
@@ -1143,6 +1140,9 @@
if (self.mBySeconds is not None) and (len(self.mBySeconds) != 0):
items[:] = self.bySecondExpand(items)
+ # Remove invalid items before BYSETPOS
+ items[:] = filter(lambda x: not x.invalid(), items)
+
if (self.mBySetPos is not None) and (len(self.mBySetPos) != 0):
items[:] = self.bySetPosLimit(items)
@@ -1188,6 +1188,9 @@
if ((self.mBySeconds is not None) and (len(self.mBySeconds) != 0)):
items[:] = self.bySecondExpand(items)
+ # Remove invalid items before BYSETPOS
+ items[:] = filter(lambda x: not x.invalid(), items)
+
if ((self.mBySetPos is not None) and (len(self.mBySetPos) != 0)):
items[:] = self.bySetPosLimit(items)
@@ -1225,6 +1228,9 @@
if (self.mBySeconds is not None) and (len(self.mBySeconds) != 0):
items[:] = self.bySecondExpand(items)
+ # Remove invalid items before BYSETPOS
+ items[:] = filter(lambda x: not x.invalid(), items)
+
if (self.mBySetPos is not None) and (len(self.mBySetPos) != 0):
items[:] = self.bySetPosLimit(items)
@@ -1267,6 +1273,9 @@
if (self.mBySeconds is not None) and (len(self.mBySeconds) != 0):
items[:] = self.bySecondExpand(items)
+ # Remove invalid items before BYSETPOS
+ items[:] = filter(lambda x: not x.invalid(), items)
+
if (self.mBySetPos is not None) and (len(self.mBySetPos) != 0):
items[:] = self.bySetPosLimit(items)
@@ -1311,6 +1320,9 @@
if (self.mBySeconds is not None) and (len(self.mBySeconds) != 0):
items[:] = self.bySecondExpand(items)
+ # Remove invalid items before BYSETPOS
+ items[:] = filter(lambda x: not x.invalid(), items)
+
if (self.mBySetPos is not None) and (len(self.mBySetPos) != 0):
items[:] = self.bySetPosLimit(items)
@@ -1357,6 +1369,9 @@
if (self.mBySeconds is not None) and (len(self.mBySeconds) != 0):
items[:] = self.bySecondExpand(items)
+ # Remove invalid items before BYSETPOS
+ items[:] = filter(lambda x: not x.invalid(), items)
+
if (self.mBySetPos is not None) and (len(self.mBySetPos) != 0):
items[:] = self.bySetPosLimit(items)
@@ -1405,6 +1420,9 @@
if (len(items) == 0):
return
+ # Remove invalid items before BYSETPOS
+ items[:] = filter(lambda x: not x.invalid(), items)
+
if (self.mBySetPos is not None) and (len(self.mBySetPos) != 0):
items[:] = self.bySetPosLimit(items)
Added: PyCalendar/trunk/src/pycalendar/icalendar/tests/rrule_examples.json
===================================================================
--- PyCalendar/trunk/src/pycalendar/icalendar/tests/rrule_examples.json (rev 0)
+++ PyCalendar/trunk/src/pycalendar/icalendar/tests/rrule_examples.json 2015-08-01 02:37:47 UTC (rev 15020)
@@ -0,0 +1,231 @@
+[
+ {
+ "rule": "FREQ=YEARLY;BYWEEKNO=1,2",
+ "start": "20130101T000000",
+ "end": "20170101T000000",
+ "results": [
+ "20130101T000000",
+ "20130108T000000",
+ "20140101T000000",
+ "20140108T000000",
+ "20150101T000000",
+ "20150108T000000",
+ "20160108T000000",
+ "20160115T000000"
+ ]
+ },
+ {
+ "rule": "FREQ=MONTHLY",
+ "start": "20140140T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20140209T120000",
+ "20140309T120000",
+ "20140409T120000",
+ "20140509T120000",
+ "20140609T120000",
+ "20140709T120000",
+ "20140809T120000",
+ "20140909T120000",
+ "20141009T120000",
+ "20141109T120000",
+ "20141209T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=MONTHLY",
+ "start": "20140131T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20140131T120000",
+ "20140331T120000",
+ "20140531T120000",
+ "20140731T120000",
+ "20140831T120000",
+ "20141031T120000",
+ "20141231T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=MONTHLY;BYMONTHDAY=31",
+ "start": "20140131T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20140131T120000",
+ "20140331T120000",
+ "20140531T120000",
+ "20140731T120000",
+ "20140831T120000",
+ "20141031T120000",
+ "20141231T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=MONTHLY;BYMONTHDAY=-31",
+ "start": "20140101T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20140101T120000",
+ "20140301T120000",
+ "20140501T120000",
+ "20140701T120000",
+ "20140801T120000",
+ "20141001T120000",
+ "20141201T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=MONTHLY;BYDAY=-1FR",
+ "start": "20140131T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20140131T120000",
+ "20140228T120000",
+ "20140328T120000",
+ "20140425T120000",
+ "20140530T120000",
+ "20140627T120000",
+ "20140725T120000",
+ "20140829T120000",
+ "20140926T120000",
+ "20141031T120000",
+ "20141128T120000",
+ "20141226T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=MONTHLY;BYDAY=5FR",
+ "start": "20140131T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20140131T120000",
+ "20140530T120000",
+ "20140829T120000",
+ "20141031T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1",
+ "start": "20140131T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20140131T120000",
+ "20140228T120000",
+ "20140331T120000",
+ "20140430T120000",
+ "20140530T120000",
+ "20140630T120000",
+ "20140731T120000",
+ "20140829T120000",
+ "20140930T120000",
+ "20141031T120000",
+ "20141128T120000",
+ "20141231T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1",
+ "start": "20140127T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20140131T120000",
+ "20140228T120000",
+ "20140331T120000",
+ "20140430T120000",
+ "20140530T120000",
+ "20140630T120000",
+ "20140731T120000",
+ "20140829T120000",
+ "20140930T120000",
+ "20141031T120000",
+ "20141128T120000",
+ "20141231T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=MONTHLY;INTERVAL=2;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1",
+ "start": "20140127T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20140131T120000",
+ "20140331T120000",
+ "20140530T120000",
+ "20140731T120000",
+ "20140930T120000",
+ "20141128T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=MONTHLY;BYDAY=-1MO,-1TU,-1WE,-1TH,-1FR;BYSETPOS=-1",
+ "start": "20140130T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20140131T120000",
+ "20140228T120000",
+ "20140331T120000",
+ "20140430T120000",
+ "20140530T120000",
+ "20140630T120000",
+ "20140731T120000",
+ "20140829T120000",
+ "20140930T120000",
+ "20141031T120000",
+ "20141128T120000",
+ "20141231T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=YEARLY",
+ "start": "20120229T120000",
+ "end": "20200101T000000",
+ "results": [
+ "20120229T120000",
+ "20160229T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=YEARLY;BYYEARDAY=366",
+ "start": "20121231T120000",
+ "end": "20200101T000000",
+ "results": [
+ "20121231T120000",
+ "20161231T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=YEARLY;BYDAY=-1FR;BYMONTH=10",
+ "start": "20101029T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20101029T120000",
+ "20111028T120000",
+ "20121026T120000",
+ "20131025T120000",
+ "20141031T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=YEARLY;BYDAY=1FR;BYMONTH=4",
+ "start": "20100402T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20100402T120000",
+ "20110401T120000",
+ "20120406T120000",
+ "20130405T120000",
+ "20140404T120000"
+ ]
+ },
+ {
+ "rule": "FREQ=YEARLY;BYDAY=FR;BYMONTHDAY=21,22,23,24,25,26,27;BYMONTH=10",
+ "start": "20101022T120000",
+ "end": "20150101T000000",
+ "results": [
+ "20101022T120000",
+ "20111021T120000",
+ "20121026T120000",
+ "20131025T120000",
+ "20141024T120000"
+ ]
+ }
+]
Modified: PyCalendar/trunk/src/pycalendar/icalendar/tests/test_json.py
===================================================================
--- PyCalendar/trunk/src/pycalendar/icalendar/tests/test_json.py 2015-07-31 19:11:05 UTC (rev 15019)
+++ PyCalendar/trunk/src/pycalendar/icalendar/tests/test_json.py 2015-08-01 02:37:47 UTC (rev 15020)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
##
# Copyright (c) 2007-2013 Cyrus Daboo. All rights reserved.
#
@@ -14,6 +15,7 @@
# limitations under the License.
##
+
from pycalendar.icalendar.calendar import Calendar
from pycalendar.icalendar.property import Property
import difflib
Modified: PyCalendar/trunk/src/pycalendar/icalendar/tests/test_recurrence.py
===================================================================
--- PyCalendar/trunk/src/pycalendar/icalendar/tests/test_recurrence.py 2015-07-31 19:11:05 UTC (rev 15019)
+++ PyCalendar/trunk/src/pycalendar/icalendar/tests/test_recurrence.py 2015-08-01 02:37:47 UTC (rev 15020)
@@ -19,6 +19,8 @@
from pycalendar.icalendar.recurrence import Recurrence
import unittest
from pycalendar.timezone import Timezone
+import os
+import json
class TestRecurrence(unittest.TestCase):
@@ -116,57 +118,6 @@
self.assertNotEqual(hashes[i - 1], hashes[i])
- def testByWeekNoExpand(self):
-
- recur = Recurrence()
- recur.parse("FREQ=YEARLY;BYWEEKNO=1,2")
- start = DateTime(2013, 1, 1, 0, 0, 0)
- end = DateTime(2017, 1, 1, 0, 0, 0)
- items = []
- range = Period(start, end)
- recur.expand(start, range, items)
- self.assertEqual(
- items,
- [
- DateTime(2013, 1, 1, 0, 0, 0),
- DateTime(2013, 1, 8, 0, 0, 0),
- DateTime(2014, 1, 1, 0, 0, 0),
- DateTime(2014, 1, 8, 0, 0, 0),
- DateTime(2015, 1, 1, 0, 0, 0),
- DateTime(2015, 1, 8, 0, 0, 0),
- DateTime(2016, 1, 8, 0, 0, 0),
- DateTime(2016, 1, 15, 0, 0, 0),
- ],
- )
-
-
- def testMonthlyInvalidStart(self):
-
- recur = Recurrence()
- recur.parse("FREQ=MONTHLY")
- start = DateTime(2014, 1, 40, 12, 0, 0)
- end = DateTime(2015, 1, 1, 0, 0, 0)
- items = []
- range = Period(start, end)
- recur.expand(start, range, items)
- self.assertEqual(
- items,
- [
- DateTime(2014, 2, 9, 12, 0, 0),
- DateTime(2014, 3, 9, 12, 0, 0),
- DateTime(2014, 4, 9, 12, 0, 0),
- DateTime(2014, 5, 9, 12, 0, 0),
- DateTime(2014, 6, 9, 12, 0, 0),
- DateTime(2014, 7, 9, 12, 0, 0),
- DateTime(2014, 8, 9, 12, 0, 0),
- DateTime(2014, 9, 9, 12, 0, 0),
- DateTime(2014, 10, 9, 12, 0, 0),
- DateTime(2014, 11, 9, 12, 0, 0),
- DateTime(2014, 12, 9, 12, 0, 0),
- ],
- )
-
-
def testWeeklyTwice(self):
recur = Recurrence()
@@ -230,166 +181,37 @@
DateTime(2014, 7, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")),
DateTime(2014, 8, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")),
DateTime(2014, 9, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")),
- DateTime(2014, 10, 1, 12, 0, 0),
- DateTime(2014, 11, 1, 12, 0, 0),
- DateTime(2014, 12, 1, 12, 0, 0),
+ DateTime(2014, 10, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")),
+ DateTime(2014, 11, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")),
+ DateTime(2014, 12, 1, 12, 0, 0, tzid=Timezone(tzid="America/New_York")),
],
)
- def testMonthlyStart31st(self):
+ def testExampleRules(self):
- recur = Recurrence()
- recur.parse("FREQ=MONTHLY")
- start = DateTime(2014, 1, 31, 12, 0, 0)
- end = DateTime(2015, 1, 1, 0, 0, 0)
- items = []
- range = Period(start, end)
- recur.expand(start, range, items)
- self.assertEqual(
- items,
- [
- DateTime(2014, 1, 31, 12, 0, 0),
- DateTime(2014, 3, 31, 12, 0, 0),
- DateTime(2014, 5, 31, 12, 0, 0),
- DateTime(2014, 7, 31, 12, 0, 0),
- DateTime(2014, 8, 31, 12, 0, 0),
- DateTime(2014, 10, 31, 12, 0, 0),
- DateTime(2014, 12, 31, 12, 0, 0),
- ],
- )
+ examples = os.path.join(os.path.dirname(__file__), "rrule_examples.json")
+ with open(examples) as f:
+ examples = json.loads(f.read())
+ for ctr, i in enumerate(examples):
- def testMonthlyByMonthDay31(self):
+ recur = Recurrence()
+ recur.parse(i["rule"])
+ start = DateTime.parseText(i["start"])
+ end = DateTime.parseText(i["end"])
+ results = map(DateTime.parseText, i["results"])
- recur = Recurrence()
- recur.parse("FREQ=MONTHLY;BYMONTHDAY=31")
- start = DateTime(2014, 1, 31, 12, 0, 0)
- end = DateTime(2015, 1, 1, 0, 0, 0)
- items = []
- range = Period(start, end)
- recur.expand(start, range, items)
- self.assertEqual(
- items,
- [
- DateTime(2014, 1, 31, 12, 0, 0),
- DateTime(2014, 3, 31, 12, 0, 0),
- DateTime(2014, 5, 31, 12, 0, 0),
- DateTime(2014, 7, 31, 12, 0, 0),
- DateTime(2014, 8, 31, 12, 0, 0),
- DateTime(2014, 10, 31, 12, 0, 0),
- DateTime(2014, 12, 31, 12, 0, 0),
- ],
- )
+ items = []
+ range = Period(start, end)
+ recur.expand(start, range, items)
+ self.assertEqual(
+ items,
+ results,
+ msg="Failed rule: #{} {}".format(ctr + 1, i["rule"])
+ )
- def testMonthlyByMonthDayMinus31(self):
-
- recur = Recurrence()
- recur.parse("FREQ=MONTHLY;BYMONTHDAY=-31")
- start = DateTime(2014, 1, 1, 12, 0, 0)
- end = DateTime(2015, 1, 1, 0, 0, 0)
- items = []
- range = Period(start, end)
- recur.expand(start, range, items)
- self.assertEqual(
- items,
- [
- DateTime(2014, 1, 1, 12, 0, 0),
- DateTime(2014, 3, 1, 12, 0, 0),
- DateTime(2014, 5, 1, 12, 0, 0),
- DateTime(2014, 7, 1, 12, 0, 0),
- DateTime(2014, 8, 1, 12, 0, 0),
- DateTime(2014, 10, 1, 12, 0, 0),
- DateTime(2014, 12, 1, 12, 0, 0),
- ],
- )
-
-
- def testMonthlyByLastFridayExpand(self):
-
- recur = Recurrence()
- recur.parse("FREQ=MONTHLY;BYDAY=-1FR")
- start = DateTime(2014, 1, 31, 12, 0, 0)
- end = DateTime(2015, 1, 1, 0, 0, 0)
- items = []
- range = Period(start, end)
- recur.expand(start, range, items)
- self.assertEqual(
- items,
- [
- DateTime(2014, 1, 31, 12, 0, 0),
- DateTime(2014, 2, 28, 12, 0, 0),
- DateTime(2014, 3, 28, 12, 0, 0),
- DateTime(2014, 4, 25, 12, 0, 0),
- DateTime(2014, 5, 30, 12, 0, 0),
- DateTime(2014, 6, 27, 12, 0, 0),
- DateTime(2014, 7, 25, 12, 0, 0),
- DateTime(2014, 8, 29, 12, 0, 0),
- DateTime(2014, 9, 26, 12, 0, 0),
- DateTime(2014, 10, 31, 12, 0, 0),
- DateTime(2014, 11, 28, 12, 0, 0),
- DateTime(2014, 12, 26, 12, 0, 0),
- ],
- )
-
-
- def testMonthlyByFifthFridayExpand(self):
-
- recur = Recurrence()
- recur.parse("FREQ=MONTHLY;BYDAY=5FR")
- start = DateTime(2014, 1, 31, 12, 0, 0)
- end = DateTime(2015, 1, 1, 0, 0, 0)
- items = []
- range = Period(start, end)
- recur.expand(start, range, items)
- self.assertEqual(
- items,
- [
- DateTime(2014, 1, 31, 12, 0, 0),
- DateTime(2014, 5, 30, 12, 0, 0),
- DateTime(2014, 8, 29, 12, 0, 0),
- DateTime(2014, 10, 31, 12, 0, 0),
- ],
- )
-
-
- def testYearlyLeapDay(self):
-
- recur = Recurrence()
- recur.parse("FREQ=YEARLY")
- start = DateTime(2012, 2, 29, 12, 0, 0)
- end = DateTime(2020, 1, 1, 0, 0, 0)
- items = []
- range = Period(start, end)
- recur.expand(start, range, items)
- self.assertEqual(
- items,
- [
- DateTime(2012, 2, 29, 12, 0, 0),
- DateTime(2016, 2, 29, 12, 0, 0),
- ],
- )
-
-
- def testYearlyYearDay(self):
-
- recur = Recurrence()
- recur.parse("FREQ=YEARLY;BYYEARDAY=366")
- start = DateTime(2012, 12, 31, 12, 0, 0)
- end = DateTime(2020, 1, 1, 0, 0, 0)
- items = []
- range = Period(start, end)
- recur.expand(start, range, items)
- self.assertEqual(
- items,
- [
- DateTime(2012, 12, 31, 12, 0, 0),
- DateTime(2016, 12, 31, 12, 0, 0),
- ],
- )
-
-
def testClearOnChange(self):
recur = Recurrence()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150731/42b24848/attachment-0001.html>
More information about the calendarserver-changes
mailing list