diff options
Diffstat (limited to 'tests.patch')
-rw-r--r-- | tests.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/tests.patch b/tests.patch new file mode 100644 index 000000000000..b71151c4e05e --- /dev/null +++ b/tests.patch @@ -0,0 +1,67 @@ +--- django_ical/tests.py.old 2015-07-15 15:06:29.532564747 +0200 ++++ django_ical/tests.py 2015-07-15 15:06:42.705891733 +0200 +@@ -6,6 +6,7 @@ + + from django.test import TestCase + from django.test.client import RequestFactory ++from six import b + + from django_ical.feedgenerator import ICal20Feed + from django_ical.views import ICalFeed +@@ -69,7 +70,7 @@ + if organizer_dic: + if isinstance(organizer_dic, dict): + organizer = icalendar.vCalAddress('MAILTO:%s' % organizer_dic['email']) +- for key, val in organizer_dic.iteritems(): ++ for key, val in organizer_dic.items(): + if key is not 'email': + organizer.params[key] = icalendar.vText(val) + else: +@@ -119,20 +120,20 @@ + self.assertEquals(calendar.subcomponents[0]['SUMMARY'], 'Title1') + self.assertEquals(calendar.subcomponents[0]['DESCRIPTION'], 'Description1') + self.assertTrue(calendar.subcomponents[0]['URL'].endswith('/event/1')) +- self.assertEquals(calendar.subcomponents[0]['DTSTART'].to_ical(), '20120501T180000') +- self.assertEquals(calendar.subcomponents[0]['DTEND'].to_ical(), '20120501T200000') ++ self.assertEquals(calendar.subcomponents[0]['DTSTART'].to_ical(), b('20120501T180000')) ++ self.assertEquals(calendar.subcomponents[0]['DTEND'].to_ical(), b('20120501T200000')) + self.assertEquals(calendar.subcomponents[0]['GEO'].to_ical(), "37.386013;-122.082932") + self.assertEquals(calendar.subcomponents[0]['ORGANIZER'].to_ical(), +- "MAILTO:john.doe@example.com") ++ b("MAILTO:john.doe@example.com")) + + self.assertEquals(calendar.subcomponents[1]['SUMMARY'], 'Title2') + self.assertEquals(calendar.subcomponents[1]['DESCRIPTION'], 'Description2') + self.assertTrue(calendar.subcomponents[1]['URL'].endswith('/event/2')) +- self.assertEquals(calendar.subcomponents[1]['DTSTART'].to_ical(), '20120506T180000') +- self.assertEquals(calendar.subcomponents[1]['DTEND'].to_ical(), '20120506T200000') ++ self.assertEquals(calendar.subcomponents[1]['DTSTART'].to_ical(), b('20120506T180000')) ++ self.assertEquals(calendar.subcomponents[1]['DTEND'].to_ical(), b('20120506T200000')) + self.assertEquals(calendar.subcomponents[1]['GEO'].to_ical(), "37.386013;-122.082932") + self.assertEquals(calendar.subcomponents[0]['ORGANIZER'].to_ical(), +- "MAILTO:john.doe@example.com") ++ b("MAILTO:john.doe@example.com")) + + def test_wr_timezone(self): + """ +@@ -176,16 +177,16 @@ + calendar = icalendar.Calendar.from_ical(response.content) + self.assertEquals(len(calendar.subcomponents), 2) + +- self.assertEquals(calendar.subcomponents[0]['DTSTART'].to_ical(), '20120501T180000') ++ self.assertEquals(calendar.subcomponents[0]['DTSTART'].to_ical(), b('20120501T180000')) + self.assertEquals(calendar.subcomponents[0]['DTSTART'].params['TZID'], 'Asia/Tokyo') + +- self.assertEquals(calendar.subcomponents[0]['DTEND'].to_ical(), '20120501T200000') ++ self.assertEquals(calendar.subcomponents[0]['DTEND'].to_ical(), b('20120501T200000')) + self.assertEquals(calendar.subcomponents[0]['DTEND'].params['TZID'], 'Asia/Tokyo') + +- self.assertEquals(calendar.subcomponents[1]['DTSTART'].to_ical(), '20120506T180000') ++ self.assertEquals(calendar.subcomponents[1]['DTSTART'].to_ical(), b('20120506T180000')) + self.assertEquals(calendar.subcomponents[1]['DTSTART'].params['TZID'], 'US/Eastern') + +- self.assertEquals(calendar.subcomponents[1]['DTEND'].to_ical(), '20120506T200000') ++ self.assertEquals(calendar.subcomponents[1]['DTEND'].to_ical(), b('20120506T200000')) + self.assertEquals(calendar.subcomponents[1]['DTEND'].params['TZID'], 'US/Eastern') + + def test_file_name(self): |