X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=icalparse.py;h=59e409b4325e65046437eab6cd771868c742ae92;hb=ee8a5360ac1f00ccbeef97c53d8615f6615108bf;hp=1d62a7057554cd4142881c43411449d4f7f09589;hpb=a60d888467b796bdf7ed7cd63c53cef8dcfc779c;p=frenchie%2Ficalparse.git diff --git a/icalparse.py b/icalparse.py index 1d62a70..59e409b 100755 --- a/icalparse.py +++ b/icalparse.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Copyright (c) 2013 James French # @@ -21,7 +21,7 @@ # THE SOFTWARE. import sys, os -import urlparse +from urllib import (request, error, parse) import vobject from cgi import parse_header @@ -34,7 +34,7 @@ def getContent(url='',stdin=False): # Special case, if this is a HTTP url, return the data from it using # the HTTP functions which attempt to play a bit nicer. - parsedURL = urlparse.urlparse(url) + parsedURL = parse.urlparse(url) if 'http' in parsedURL[0]: return getHTTPContent(url) if stdin: @@ -44,13 +44,12 @@ def getContent(url='',stdin=False): if not parsedURL[0]: url = 'file://' + os.path.abspath(url) # If we've survived, use python's generic URL opening library to handle it - import urllib2 try: - res = urllib2.urlopen(url) + res = request.urlopen(url) content = res.read() ct = res.info().getplist() res.close() - except (urllib2.URLError, OSError), e: + except (error.URLError, OSError) as e: sys.stderr.write('%s\n'%e) sys.exit(1) @@ -62,28 +61,28 @@ def getContent(url='',stdin=False): return (content, encoding) -def getHTTPContent(url='',cache='.httplib2-cache'): +def getHTTPContent(url=''): '''This function attempts to play nice when retrieving content from HTTP services. It's what you should use in a CGI script.''' try: import httplib2 except ImportError: - import urllib2 + pass if not url: return ('','') - if not 'http' in urlparse.urlparse(url)[0]: return ('','') + if not 'http' in parse.urlparse(url)[0]: return ('','') if 'httplib2' in sys.modules: - try: h = httplib2.Http('.httplib2-cache') + try: h = httplib2.Http() except OSError: h = httplib2.Http() else: h = False if h: try: req = h.request(url) - except ValueError, e: + except ValueError as e: sys.stderr.write('%s\n'%e) sys.exit(1) @@ -99,8 +98,8 @@ def getHTTPContent(url='',cache='.httplib2-cache'): else: try: - req = urllib2.urlopen(url) - except urllib2.URLError, e: + req = request.urlopen(url) + except error.URLError as e: sys.stderr.write('%s\n'%e) sys.exit(1) @@ -125,6 +124,7 @@ def generateRules(ruleConfig): parserrules.ruleConfig[conf] = ruleConfig[conf] rules = [getattr(parserrules, rule) for rule in dir(parserrules) if callable(getattr(parserrules, rule))] + return rules @@ -149,7 +149,7 @@ def writeOutput(cal, outfile=''): else: try: out = open(outfile, 'w') - except (IOError, OSError), e: + except (IOError, OSError) as e: sys.stderr.write('%s\n'%e) sys.exit(1) @@ -193,66 +193,66 @@ def runLocal(): (content, encoding) = getContent(url, options.stdin) encoding = encoding or options.encoding or 'utf-8' - cal = vobject.readOne(unicode(content, encoding)) + cal = vobject.readOne(str(content, encoding)) cal = applyRules(cal, generateRules(ruleConfig), options.verbose) writeOutput(cal, options.outfile) def exitQuiet(exitstate=0): - '''When called as a CGI script, exit quietly if theres any errors''' - print('Content-Type: text/html\n') - sys.exit(exitstate) + '''When called as a CGI script, exit quietly if theres any errors''' + print('Content-Type: text/html\n') + sys.exit(exitstate) def runCGI(): - '''Main run function if this script is called as a CGI script - to process facebook ical files''' - import cgi - import re - import cgitb; cgitb.enable() - - ruleConfig["facebook"] = True - - form = cgi.FieldStorage() - if "uid" not in form or "key" not in form: - print('Content-Type: text/calendar\n') - sys.exit(0) - try: - # UID should be numeric, if it's not we have someone playing games - uid = int(form['uid'].value) - except: - exitQuiet() - - # The user's key will be a 16 character string - key = form['key'].value - re.search('[&?]+', key) and exitQuiet() - len(key) == 16 or exitQuiet() - - # Historically facebook has been notoriously bad at setting timzeones - # in their stuff so this should be a user setting. If it is set in - # their calendar it'll be used otherwise if the user feeds crap or - # nothing just assume they want Australia/Perth - tz = "" - if "tz" in form: - from pytz import timezone - try: - timezone(form['tz'].value) - tz = form['tz'].value - except: pass - - ruleConfig["defaultTZ"] = tz or ruleConfig["defaultTZ"] - - # Okay, we're happy that the input is sane, lets serve up some data - url = 'http://www.facebook.com/ical/u.php?uid=%d&key=%s'%(uid,key) - (content, encoding) = getHTTPContent(url) - - cal = vobject.readOne(unicode(content, encoding)) - cal = applyRules(cal, generateRules(ruleConfig), False) - - print('Content-Type: text/calendar; charset=%s\n'%encoding) - writeOutput(cal) - + '''Main run function if this script is called as a CGI script + to process facebook ical files''' + import cgi + import re + import cgitb; cgitb.enable() + + ruleConfig["facebook"] = True + + form = cgi.FieldStorage() + if "uid" not in form or "key" not in form: + print('Content-Type: text/calendar\n') + sys.exit(0) + try: + # UID should be numeric, if it's not we have someone playing games + uid = int(form['uid'].value) + except: + exitQuiet() + + # The user's key will be a 16 character string + key = form['key'].value + re.search('[&?]+', key) and exitQuiet() + len(key) == 16 or exitQuiet() + + # Historically facebook has been notoriously bad at setting timzeones + # in their stuff so this should be a user setting. If it is set in + # their calendar it'll be used otherwise if the user feeds crap or + # nothing just assume they want Australia/Perth + tz = "" + if "tz" in form: + from pytz import timezone + try: + timezone(form['tz'].value) + tz = form['tz'].value + except: pass + + ruleConfig["defaultTZ"] = tz or ruleConfig["defaultTZ"] + + # Okay, we're happy that the input is sane, lets serve up some data + url = 'https://www.facebook.com/events/ical/upcoming/?uid=%s&key=%s'%(uid,key) + (content, encoding) = getHTTPContent(url) + + cal = vobject.readOne(str(content, encoding)) + cal = applyRules(cal, generateRules(ruleConfig), False) + + print(('Content-Type: text/calendar; charset=%s\n'%encoding)) + writeOutput(cal) + if __name__ == '__main__': # Ensure the rules process using the desired timezone