1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
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):
|