Merge branch 'master' of https://github.com/pennlabs/penn-sdk-python

Author: esqu1

penn/calendar3year.py

@@ -29,11 +29,11 @@ def pull_3year(self):
             elif line[:7] == "DTSTART":
                 raw_date = line.split(":")[1]
                 start_date = datetime.datetime.strptime(raw_date, '%Y%m%d').date()
-                d['start'] = start_date
+                d['start'] = start_date.strftime('%Y-%m-%d')
             elif line[:5] == "DTEND":
                 raw_date = line.split(":")[1]
                 end_date = datetime.datetime.strptime(raw_date,'%Y%m%d').date()
-                d['end'] = end_date
+                d['end'] = end_date.strftime('%Y-%m-%d')
             elif line[:7] == "SUMMARY":
                 name = line.split(":")[1]
                 d['name'] = name.encode('utf-8').strip()

tests/calendar_test.py

@@ -19,21 +19,21 @@ def test_date(self):
         for event in l:
             if event['name'] == "Independence Day Observed (no classes)":
                 independence = event['start']
-                ok_(isinstance(independence, datetime.date))
-                ok_(independence.month == 7)
+                d = datetime.datetime.strptime(independence, '%Y-%m-%d').date()
+                ok_(d.month == 7)
 
     def test_name(self):
         l = self.calendar.pull_3year()
         ok_(len(l) > 0)
         for event in l:
-            start = event['start']
-            end = event['end']
+            start = datetime.datetime.strptime(event['start'], '%Y-%m-%d').date()
+            end = datetime.datetime.strptime(event['end'], '%Y-%m-%d').date()
             ok_((end - start).total_seconds() >= 0)
 
     def test_chrono(self):
         l = self.calendar.pull_3year()
         ok_(len(l) > 0)        
         for i, event in enumerate(l[:-1]):            
-            start = event['start']
-            nextstart = l[i]['start']
+            start = datetime.datetime.strptime(event['start'], '%Y-%m-%d').date()
+            nextstart = datetime.datetime.strptime(l[i]['start'], '%Y-%m-%d').date()
             ok_((nextstart - start).total_seconds() >= 0)