commit: b8d836e445484b6db4a2fd4c9102e0518889f220
parent: b22dd51bd7fc7234a40b664964a6210cbe7bf455
Author: Adam Tauber <asciimoo@gmail.com>
Date: Wed, 5 Feb 2014 20:29:05 +0100
Merge pull request #34 from Aigeruth/pep8
Improves PEP8 compatibility.
Diffstat:
12 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/searx/engines/__init__.py b/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 searx import settings
-from searx.utils import gen_useragent
-import sys
from datetime import datetime
+import grequests
from flask.ext.babel import gettext
+from searx import settings
+from searx.utils import gen_useragent
engine_dir = dirname(realpath(__file__))
diff --git a/searx/engines/bing.py b/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}'
diff --git a/searx/engines/dailymotion.py b/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'
diff --git a/searx/engines/deviantart.py b/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']
diff --git a/searx/engines/piratebay.py b/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']
diff --git a/searx/engines/stackoverflow.py b/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']
diff --git a/searx/engines/vimeo.py b/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}'
diff --git a/searx/engines/yahoo.py b/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}'
diff --git a/searx/engines/youtube.py b/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
diff --git a/searx/tests/test_robot.py b/searx/tests/test_robot.py
@@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-
+import os
+import unittest2 as unittest
from plone.testing import layered
from robotsuite import RobotTestSuite
from searx.testing import SEARXROBOTLAYER
-import os
-import unittest2 as unittest
-
def test_suite():
suite = unittest.TestSuite()
diff --git a/searx/tests/test_webapp.py b/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):
diff --git a/searx/webapp.py b/searx/webapp.py
@@ -21,22 +21,18 @@ import json
import cStringIO
import os
-from flask import Flask, request, render_template
-from flask import url_for, Response, make_response, redirect
-from flask import send_from_directory
-
+from flask import (
+ Flask, request, render_template, url_for, Response, make_response,
+ redirect, send_from_directory
+)
+from flask.ext.babel import Babel
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.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
-from flask.ext.babel import Babel
-
app = Flask(
__name__,
