From ec7b65ad95e3c162f52fa640081bdb6577ec7014 Mon Sep 17 00:00:00 2001 From: Martin Simon Date: Wed, 15 Apr 2015 16:42:52 +0200 Subject: [PATCH] fix JSON TypeError --- pylevel2/api.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pylevel2/api.py b/pylevel2/api.py index 25d6397..34bd047 100644 --- a/pylevel2/api.py +++ b/pylevel2/api.py @@ -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