Merge pull request #34 from Aigeruth/pep8

Improves PEP8 compatibility.

searx/engines/__init__.py

@@ -17,16 +17,16 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
 '''
 
 from os.path import realpath, dirname, splitext, join
+import sys
 from imp import load_source
-import grequests
 from itertools import izip_longest, chain
 from operator import itemgetter
 from urlparse import urlparse
+from datetime import datetime
+import grequests
+from flask.ext.babel import gettext
 from searx import settings
 from searx.utils import gen_useragent
-import sys
-from datetime import datetime
-from flask.ext.babel import gettext
 
 engine_dir = dirname(realpath(__file__))
 

searx/engines/bing.py

@@ -1,6 +1,6 @@
-from lxml import html
 from urllib import urlencode
 from cgi import escape
+from lxml import html
 
 base_url = 'http://www.bing.com/'
 search_string = 'search?{query}&first={offset}'

searx/engines/dailymotion.py

@@ -1,6 +1,6 @@
 from urllib import urlencode
-from lxml import html
 from json import loads
+from lxml import html
 
 categories = ['videos']
 locale = 'en_US'

searx/engines/deviantart.py

@@ -1,6 +1,6 @@
 from urllib import urlencode
-from lxml import html
 from urlparse import urljoin
+from lxml import html
 
 categories = ['images']
 

searx/engines/piratebay.py

@@ -1,7 +1,7 @@
-from lxml import html
 from urlparse import urljoin
 from cgi import escape
 from urllib import quote
+from lxml import html
 
 categories = ['videos', 'music']
 

searx/engines/stackoverflow.py

@@ -1,7 +1,7 @@
-from lxml import html
 from urlparse import urljoin
 from cgi import escape
 from urllib import urlencode
+from lxml import html
 
 categories = ['it']
 

searx/engines/vimeo.py

@@ -1,7 +1,7 @@
 from urllib import urlencode
 from HTMLParser import HTMLParser
-from xpath import extract_text
 from lxml import html
+from xpath import extract_text
 
 base_url = 'http://vimeo.com'
 search_url = base_url + '/search?{query}'

searx/engines/yahoo.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 from urllib import urlencode
-from searx.engines.xpath import extract_text, extract_url
 from lxml import html
+from searx.engines.xpath import extract_text, extract_url
 
 categories = ['general']
 search_url = 'http://search.yahoo.com/search?{query}&b={offset}'

searx/engines/youtube.py

@@ -3,7 +3,8 @@ from urllib import urlencode
 
 categories = ['videos']
 
-search_url = 'https://gdata.youtube.com/feeds/api/videos?alt=json&{query}&start-index={index}&max-results=25'  # noqa
+search_url = ('https://gdata.youtube.com/feeds/api/videos'
+              '?alt=json&{query}&start-index={index}&max-results=25')  # noqa
 
 paging = True
 

searx/tests/test_robot.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from plone.testing import layered
-from robotsuite import RobotTestSuite
-from searx.testing import SEARXROBOTLAYER
-
 import os
 import unittest2 as unittest
+from plone.testing import layered
+from robotsuite import RobotTestSuite
+from searx.testing import SEARXROBOTLAYER
 
 
 def test_suite():

searx/tests/test_webapp.py

@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
 
+import json
+from urlparse import ParseResult
 from mock import patch
 from searx import webapp
 from searx.testing import SearxTestCase
-from urlparse import ParseResult
-
-
-import json
 
 
 class ViewsTestCase(SearxTestCase):

searx/webapp.py

@@ -21,21 +21,17 @@ import json
 import cStringIO
 import os
 
-from flask import Flask, request, render_template
+from flask import (
-from flask import url_for, Response, make_response, redirect
+    Flask, request, render_template, url_for, Response, make_response,
-from flask import send_from_directory
+    redirect, send_from_directory
-
+)
-from searx import settings, searx_dir
-from searx.engines import search
-from searx.engines import categories
-from searx.engines import engines
-from searx.engines import get_engines_stats
-from searx.engines import engine_shortcuts
-from searx.utils import UnicodeWriter
-from searx.utils import highlight_content, html_to_text
-from searx.languages import language_codes
-
 from flask.ext.babel import Babel
+from searx import settings, searx_dir
+from searx.engines import (
+    search, categories, engines, get_engines_stats, engine_shortcuts
+)
+from searx.utils import UnicodeWriter, highlight_content, html_to_text
+from searx.languages import language_codes
 
 
 app = Flask(