git.ucc.asn.au
/
frenchie
/
icalparse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tabs vs Spaces
[frenchie/icalparse.git]
/
icalparse.py
diff --git
a/icalparse.py
b/icalparse.py
index
a573b48
..
59e409b
100755
(executable)
--- a/
icalparse.py
+++ b/
icalparse.py
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/python
3
#
# Copyright (c) 2013 James French <
[email protected]
>
#
#
# Copyright (c) 2013 James French <
[email protected]
>
#
@@
-21,7
+21,7
@@
# THE SOFTWARE.
import sys, os
# THE SOFTWARE.
import sys, os
-import urlparse
+from urllib import (request, error, parse)
import vobject
from cgi import parse_header
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.
# 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 =
url
parse.urlparse(url)
+ parsedURL = parse.urlparse(url)
if 'http' in parsedURL[0]: return getHTTPContent(url)
if stdin:
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
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:
try:
- res =
urllib2
.urlopen(url)
+ res =
request
.urlopen(url)
content = res.read()
ct = res.info().getplist()
res.close()
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)
sys.stderr.write('%s\n'%e)
sys.exit(1)
@@
-62,28
+61,28
@@
def getContent(url='',stdin=False):
return (content, encoding)
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:
'''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 url: return ('','')
- if not 'http' in
url
parse.urlparse(url)[0]: return ('','')
+ if not 'http' in parse.urlparse(url)[0]: return ('','')
if 'httplib2' in sys.modules:
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 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)
sys.stderr.write('%s\n'%e)
sys.exit(1)
@@
-99,8
+98,8
@@
def getHTTPContent(url='',cache='.httplib2-cache'):
else:
try:
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)
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))]
parserrules.ruleConfig[conf] = ruleConfig[conf]
rules = [getattr(parserrules, rule) for rule in dir(parserrules) if callable(getattr(parserrules, rule))]
+
return rules
return rules
@@
-149,7
+149,7
@@
def writeOutput(cal, outfile=''):
else:
try:
out = open(outfile, 'w')
else:
try:
out = open(outfile, 'w')
- except (IOError, OSError)
,
e:
+ except (IOError, OSError)
as
e:
sys.stderr.write('%s\n'%e)
sys.exit(1)
sys.stderr.write('%s\n'%e)
sys.exit(1)
@@
-193,7
+193,7
@@
def runLocal():
(content, encoding) = getContent(url, options.stdin)
encoding = encoding or options.encoding or 'utf-8'
(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)
cal = applyRules(cal, generateRules(ruleConfig), options.verbose)
writeOutput(cal, options.outfile)
@@
-244,13
+244,13
@@
def runCGI():
ruleConfig["defaultTZ"] = tz or ruleConfig["defaultTZ"]
# Okay, we're happy that the input is sane, lets serve up some data
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)
+ url = 'http
s://www.facebook.com/events/ical/upcoming/?uid=%s
&key=%s'%(uid,key)
(content, encoding) = getHTTPContent(url)
(content, encoding) = getHTTPContent(url)
- cal = vobject.readOne(
unicode
(content, encoding))
+ cal = vobject.readOne(
str
(content, encoding))
cal = applyRules(cal, generateRules(ruleConfig), False)
cal = applyRules(cal, generateRules(ruleConfig), False)
- print(
'Content-Type: text/calendar; charset=%s\n'%encoding
)
+ print(
('Content-Type: text/calendar; charset=%s\n'%encoding)
)
writeOutput(cal)
writeOutput(cal)
UCC
git Repository :: git.ucc.asn.au