dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

many pep8 improvements

Browse Source
This commit is contained in:
mdipierro
2012-10-19 12:33:53 -05:00
parent b716df1a05
commit 4b2ba185ae
117 changed files with 7160 additions and 5670 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/serializers.py
+36 -32
View File
@@ -19,61 +19,64 @@ except ImportError:
except:
import contrib.simplejson as json_parser # fallback to pure-Python module
def custom_json(o):
if hasattr(o,'custom_json') and callable(o.custom_json):
if hasattr(o, 'custom_json') and callable(o.custom_json):
return o.custom_json()
if isinstance(o, (datetime.date,
datetime.datetime,
datetime.time)):
return o.isoformat()[:19].replace('T',' ')
return o.isoformat()[:19].replace('T', ' ')
elif isinstance(o, (int, long)):
return int(o)
elif isinstance(o, decimal.Decimal):
return str(o)
elif isinstance(o, lazyT):
return str(o)
elif isinstance(o,XmlComponent):
elif isinstance(o, XmlComponent):
return str(o)
elif hasattr(o,'as_list') and callable(o.as_list):
elif hasattr(o, 'as_list') and callable(o.as_list):
return o.as_list()
elif hasattr(o,'as_dict') and callable(o.as_dict):
elif hasattr(o, 'as_dict') and callable(o.as_dict):
return o.as_dict()
else:
raise TypeError(repr(o) + " is not JSON serializable")
def xml_rec(value, key, quote=True):
if hasattr(value,'custom_xml') and callable(value.custom_xml):
if hasattr(value, 'custom_xml') and callable(value.custom_xml):
return value.custom_xml()
elif isinstance(value, (dict, Storage)):
return TAG[key](*[TAG[k](xml_rec(v, '',quote)) \
for k, v in value.items()])
return TAG[key](*[TAG[k](xml_rec(v, '', quote))
for k, v in value.items()])
elif isinstance(value, list):
return TAG[key](*[TAG.item(xml_rec(item, '',quote)) for item in value])
elif hasattr(value,'as_list') and callable(value.as_list):
return str(xml_rec(value.as_list(),'',quote))
elif hasattr(value,'as_dict') and callable(value.as_dict):
return str(xml_rec(value.as_dict(),'',quote))
return TAG[key](*[TAG.item(xml_rec(item, '', quote)) for item in value])
elif hasattr(value, 'as_list') and callable(value.as_list):
return str(xml_rec(value.as_list(), '', quote))
elif hasattr(value, 'as_dict') and callable(value.as_dict):
return str(xml_rec(value.as_dict(), '', quote))
else:
return xmlescape(value,quote)
return xmlescape(value, quote)
def xml(value, encoding='UTF-8', key='document', quote=True):
return ('<?xml version="1.0" encoding="%s"?>' % encoding) + str(xml_rec(value,key,quote))
return ('<?xml version="1.0" encoding="%s"?>' % encoding) + str(xml_rec(value, key, quote))
def json(value,default=custom_json):
return json_parser.dumps(value,default=default)
def json(value, default=custom_json):
return json_parser.dumps(value, default=default)
def csv(value):
return ''
def ics(events, title=None, link=None, timeshift=0, **ignored):
import datetime
title = title or '(unkown)'
if link and not callable(link):
link = lambda item,prefix=link: prefix.replace('[id]',str(item['id']))
link = lambda item, prefix=link: prefix.replace(
'[id]', str(item['id']))
s = 'BEGIN:VCALENDAR'
s += '\nVERSION:2.0'
s += '\nX-WR-CALNAME:%s' % title
@@ -86,9 +89,9 @@ def ics(events, title=None, link=None, timeshift=0, **ignored):
s += '\nUID:%s' % item['id']
if link:
s += '\nURL:%s' % link(item)
shift = datetime.timedelta(seconds=3600*timeshift)
start = item['start_datetime']+shift
stop = item['stop_datetime']+shift
shift = datetime.timedelta(seconds=3600 * timeshift)
start = item['start_datetime'] + shift
stop = item['stop_datetime'] + shift
s += '\nDTSTART:%s' % start.strftime('%Y%m%dT%H%M%S')
s += '\nDTEND:%s' % stop.strftime('%Y%m%dT%H%M%S')
s += '\nSUMMARY:%s' % item['title']
@@ -96,18 +99,19 @@ def ics(events, title=None, link=None, timeshift=0, **ignored):
s += '\nEND:VCALENDAR'
return s
def rss(feed):
if not 'entries' in feed and 'items' in feed:
feed['entries'] = feed['items']
now=datetime.datetime.now()
rss = rss2.RSS2(title = str(feed.get('title','(notitle)')),
link = str(feed.get('link',None)),
description = str(feed.get('description','')),
lastBuildDate = feed.get('created_on', now),
items = [rss2.RSSItem(
title=str(entry.get('title','(notitle)')),
link=str(entry.get('link',None)),
description=str(entry.get('description','')),
pubDate=entry.get('created_on', now)
) for entry in feed.get('entries',[])])
now = datetime.datetime.now()
rss = rss2.RSS2(title=str(feed.get('title', '(notitle)')),
link=str(feed.get('link', None)),
description=str(feed.get('description', '')),
lastBuildDate=feed.get('created_on', now),
items=[rss2.RSSItem(
title=str(entry.get('title', '(notitle)')),
link=str(entry.get('link', None)),
description=str(entry.get('description', '')),
pubDate=entry.get('created_on', now)
) for entry in feed.get('entries', [])])
return rss2.dumps(rss)