From 00390ed688338a4882d9f4e8681dc3296f2199db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= Date: Sat, 17 Mar 2012 08:55:12 +0200 Subject: [PATCH] Alphabetic import order, remove old catcher from python 2.5. --- openlp/plugins/remotes/lib/httpserver.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py index 45aa78418..6309666a7 100644 --- a/openlp/plugins/remotes/lib/httpserver.py +++ b/openlp/plugins/remotes/lib/httpserver.py @@ -111,15 +111,11 @@ the remotes. {"results": {"items": [{...}, {...}]}} """ +import json import logging import os -import urlparse import re - -try: - import json -except ImportError: - import simplejson as json +import urlparse from PyQt4 import QtCore, QtNetwork from mako.template import Template