Tabs vs Spaces

[frenchie/icalparse.git] / parserrules.py

diff --git a/parserrules.py b/parserrules.py
index 4ba71e8..7db0413 100644 (file)
--- a/parserrules.py
+++ b/parserrules.py
@@ -34,11 +34,14 @@ ruleConfig["defaultTZ"] = "UTC"
 def facebookOrganiser(cal):
        '''Adds organiser details to the body of facebook calendars.'''
 
-       if cal.contents.has_key(u'prodid'):
+       if 'prodid' in cal.contents:
                if not "Facebook" in cal.prodid.value: return cal
 
+       if 'vevent_list' not in dir(cal):
+               return cal
+
        for event in cal.vevent_list:
-               if not event.contents.has_key(u'organizer'): continue
+               if 'organizer' not in event.contents: continue
                try:
                        a = event.organizer.cn_paramlist
                        organizer = "Organised by: " + event.organizer.cn_param + " ("
@@ -52,10 +55,13 @@ def facebookOrganiser(cal):
 def whatPrivacy(cal):
        '''Marks events public so google calendar doesn't have a sad about them.'''
 
+       if 'vevent_list' not in dir(cal):
+               return cal
+
        for event in cal.vevent_list:
-               if event.contents.has_key(u'class'):
+               if 'class' in event.contents:
                        # Bit of a hack as class is a reserved word in python
-                       del event.contents[u'class']
+                       del event.contents['class']
                        event.add('class').value = "PUBLIC"
 
        return cal
@@ -65,6 +71,9 @@ def dropAttributes(cal):
        if "facebook" in ruleConfig:
                if ruleConfig["facebook"] == True: return cal
 
+       if 'vevent_list' not in dir(cal):
+               return cal
+
        eventBlacklist = [x.lower() for x in [
                "X-ALT-DESC",
                "X-MICROSOFT-CDO-BUSYSTATUS",
@@ -96,7 +105,7 @@ def dropAttributes(cal):
 
        for event in cal.vevent_list:
                for blacklist in eventBlacklist:
-                       if event.contents.has_key(blacklist): del event.contents[blacklist]
+                       if blacklist in event.contents: del event.contents[blacklist]
 
        for blkl in mainBlacklist:
                while blkl in cal.contents: del cal.contents[blkl]
@@ -108,22 +117,25 @@ def exDate(cal):
        if "facebook" in ruleConfig:
                if ruleConfig["facebook"] == True: return cal
 
+       if 'vevent_list' not in dir(cal):
+               return cal
+
        from datetime import datetime
        from pytz import timezone
 
        default = timezone(ruleConfig["defaultTZ"])
 
        for event in cal.vevent_list:
-               if not event.contents.has_key(u'exdate'): continue
+               if 'exdate' not in event.contents: continue
                dates = event.exdate.value
 
-               del event.contents[u'exdate']
+               del event.contents['exdate']
 
                for date in dates:
                        if isinstance(date, datetime):
                                if date.tzinfo is None: date = date.replace(tzinfo = default)
                                date = date.astimezone(vobject.icalendar.utc)
-                       entry = event.add(u'exdate')
+                       entry = event.add('exdate')
                        entry.value = [date]
 
        return cal
@@ -132,6 +144,9 @@ def utcise(cal):
        '''Removing local timezones in favour of UTC. If the remote calendar specifies a timezone
        then use it, otherwise assume it's in the user-specified or default values'''
 
+       if 'vevent_list' not in dir(cal):
+               return cal
+
        from datetime import datetime
        from pytz import timezone
 
@@ -159,6 +174,9 @@ def unwantedParams(cal):
                "TZID"
        ]
 
+       if 'vevent_list' not in dir(cal):
+               return cal
+
        for event in cal.vevent_list:
                for attr in event.contents:
                        attr = getattr(event, attr)