Alphabetic import order, remove old catcher from python 2.5.

This commit is contained in:
Mattias Põldaru 2012-03-17 08:55:12 +02:00
parent 103d38d016
commit 00390ed688
1 changed files with 2 additions and 6 deletions

View File

@ -111,15 +111,11 @@ the remotes.
{"results": {"items": [{...}, {...}]}} {"results": {"items": [{...}, {...}]}}
""" """
import json
import logging import logging
import os import os
import urlparse
import re import re
import urlparse
try:
import json
except ImportError:
import simplejson as json
from PyQt4 import QtCore, QtNetwork from PyQt4 import QtCore, QtNetwork
from mako.template import Template from mako.template import Template