From 4dd2f3e455cd6111fe2b376f8a0dd2197a5fc049 Mon Sep 17 00:00:00 2001 From: Viktor Petersson Date: Thu, 17 Jan 2013 12:06:07 +0100 Subject: [PATCH] Manually merged in pull request #37. Credits to NiKiZe for the fix. --- server.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/server.py b/server.py index 2d1290ac..835aa7bc 100644 --- a/server.py +++ b/server.py @@ -11,7 +11,6 @@ from datetime import datetime, timedelta from dateutils import datestring from hashlib import md5 from hurry.filesize import size -from json import dumps, loads from netifaces import ifaddresses from os import path, makedirs, getloadavg, statvfs from PIL import Image @@ -68,7 +67,7 @@ def get_playlist(): if (start_date and end_date) and (input_start_date < get_current_time() and input_end_date > get_current_time()): playlist.append(playlistitem) - return dumps(playlist) + return playlist def get_assets(): @@ -108,7 +107,7 @@ def get_assets(): } playlist.append(playlistitem) - return dumps(playlist) + return playlist def initiate_db(): @@ -345,7 +344,7 @@ if __name__ == "__main__": @route('/view_playlist') def view_node_playlist(): - nodeplaylist = loads(get_playlist()) + nodeplaylist = get_playlist() return template('view_playlist', nodeplaylist=nodeplaylist) @@ -353,7 +352,7 @@ if __name__ == "__main__": @route('/view_assets') def view_assets(): - nodeplaylist = loads(get_assets()) + nodeplaylist = get_assets() return template('view_assets', nodeplaylist=nodeplaylist)