Alphabetic import order, remove old catcher from python 2.5.

2012-03-17 08:55:12 +02:00 · 2012-03-17 08:55:12 +02:00 · 00390ed688
parent 103d38d016
commit 00390ed688
1 changed files with 2 additions and 6 deletions
--- 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