syn2cat
/
pylevel2
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix JSON TypeError

pull/1/head
Martin Simon 2015-04-15 16:42:52 +02:00
parent 8978457a67
commit ec7b65ad95
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pylevel2/api.py
View File

@ -1,11 +1,10 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import os
import requests
import urlparse
from datetime import datetime
import os
class PyLevel2(object):
@ -44,13 +43,13 @@ class PyLevel2(object):
if data:
for event in data:
if event.get('start'):
event['start'] = datetime.fromtimestamp(event['start'])
event['start'] = datetime.fromtimestamp(event['start']).strftime('%Y-%m-%d %H:%M:%S')
if event.get('end'):
event['end'] = datetime.fromtimestamp(event['end'])
event['end'] = datetime.fromtimestamp(event['end']).strftime('%Y-%m-%d %H:%M:%S')
if event.get('date'):
# This value does not contains the year, so it is not really usable
# Get the day from the start time instead
event['date'] = event['start'].date()
event['date'] = event['start']
to_return.append(event)
else:
# invalid query
@ -69,7 +68,7 @@ class PyLevel2(object):
if response.status_code == 200:
data = response.json()
if data:
data['state']['lastchange'] = datetime.fromtimestamp(data['state']['lastchange'])
data['state']['lastchange'] = datetime.fromtimestamp(data['state']['lastchange']).strftime('%Y-%m-%d %H:%M:%S')
else:
# invalid query
pass