diff -r 41ce1c341abe -r 10a19dd4e1c9 script/rest/export_twitter.py --- a/script/rest/export_twitter.py Tue May 07 18:28:26 2013 +0200 +++ b/script/rest/export_twitter.py Fri May 10 13:34:40 2013 +0200 @@ -1,16 +1,15 @@ #!/usr/bin/env python # coding=utf-8 -from sqlite3 import * +from sqlite3 import register_adapter, register_converter, connect, Row import datetime, time import email.utils from optparse import OptionParser import os.path -import os -import sys from lxml import etree import uuid import re +import simplejson def parse_date(date_str): ts = email.utils.parsedate_tz(date_str) @@ -20,10 +19,10 @@ return time.mktime(ts.timetuple()) def adapt_geo(geo): - return simplejson.dumps(geo) - + return simplejson.dumps(geo) + def convert_geo(s): - return simplejson.loads(s) + return simplejson.loads(s) register_adapter(datetime.datetime, adapt_datetime) @@ -73,7 +72,7 @@ ts = int(parse_date(options.start_date)) if options.end_date: - te = int(parse_date(options.end_date)) + te = int(parse_date(options.end_date)) else: te = ts + options.duration