b8d836e · searx · git.iko.soy

git.iko.soy/searx

Merge pull request #34 from Aigeruth/pep8

Improves PEP8 compatibility.

commitb8d836e445484b6db4a2fd4c9102e0518889f220 authorAdam Tauber <asciimoo@gmail.com> dateWed 5 Feb 2014, 20:29 (13 years ago) parentb22dd51 22fd074

12 files changed+26−32

compare with master

unifiedsplit

searx/engines/__init__.py+4−4 searx/engines/bing.py+1−1 searx/engines/dailymotion.py+1−1 searx/engines/deviantart.py+1−1 searx/engines/piratebay.py+1−1 searx/engines/stackoverflow.py+1−1 searx/engines/vimeo.py+1−1 searx/engines/yahoo.py+1−1 searx/engines/youtube.py+2−1 searx/tests/test_robot.py+2−3 searx/tests/test_webapp.py+2−4 searx/webapp.py+9−13

searx/engines/__init__.py+4−4

@@ -17,16 +17,16 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.

1717'''

1818

1919from os.path import realpath, dirname, splitext, join

20+import sys

2021from imp import load_source

21−import grequests

2222from itertools import izip_longest, chain

2323from operator import itemgetter

2424from urlparse import urlparse

25−from searx import settings

26−from searx.utils import gen_useragent

27−import sys

2825from datetime import datetime

26+import grequests

2927from flask.ext.babel import gettext

28+from searx import settings

29+from searx.utils import gen_useragent

3030

3131engine_dir = dirname(realpath(__file__))

3232

searx/engines/bing.py+1−1

@@ -1,6 +1,6 @@

1−from lxml import html

21from urllib import urlencode

32from cgi import escape

3+from lxml import html

55base_url = 'http://www.bing.com/'

66search_string = 'search?{query}&first={offset}'

searx/engines/dailymotion.py+1−1

@@ -1,6 +1,6 @@

11from urllib import urlencode

2−from lxml import html

32from json import loads

3+from lxml import html

55categories = ['videos']

66locale = 'en_US'

searx/engines/deviantart.py+1−1

@@ -1,6 +1,6 @@

11from urllib import urlencode

2−from lxml import html

32from urlparse import urljoin

3+from lxml import html

55categories = ['images']

searx/engines/piratebay.py+1−1

@@ -1,7 +1,7 @@

1−from lxml import html

21from urlparse import urljoin

32from cgi import escape

43from urllib import quote

4+from lxml import html

66categories = ['videos', 'music']

searx/engines/stackoverflow.py+1−1

@@ -1,7 +1,7 @@

1−from lxml import html

21from urlparse import urljoin

32from cgi import escape

43from urllib import urlencode

4+from lxml import html

66categories = ['it']

searx/engines/vimeo.py+1−1

@@ -1,7 +1,7 @@

11from urllib import urlencode

22from HTMLParser import HTMLParser

3−from xpath import extract_text

43from lxml import html

4+from xpath import extract_text

66base_url = 'http://vimeo.com'

77search_url = base_url + '/search?{query}'

searx/engines/yahoo.py+1−1

@@ -1,8 +1,8 @@

11#!/usr/bin/env python

33from urllib import urlencode

4−from searx.engines.xpath import extract_text, extract_url

54from lxml import html

5+from searx.engines.xpath import extract_text, extract_url

77categories = ['general']

88search_url = 'http://search.yahoo.com/search?{query}&b={offset}'

searx/engines/youtube.py+2−1

@@ -3,7 +3,8 @@ from urllib import urlencode

44categories = ['videos']

6−search_url = 'https://gdata.youtube.com/feeds/api/videos?alt=json&{query}&start-index={index}&max-results=25' # noqa

6+search_url = ('https://gdata.youtube.com/feeds/api/videos'

7+ '?alt=json&{query}&start-index={index}&max-results=25') # noqa

89paging = True

910

searx/tests/test_robot.py+2−3

@@ -1,12 +1,11 @@

11# -*- coding: utf-8 -*-

3+import os

4+import unittest2 as unittest

35from plone.testing import layered

46from robotsuite import RobotTestSuite

57from searx.testing import SEARXROBOTLAYER

7−import os

8−import unittest2 as unittest

9−

109

1110def test_suite():

1211 suite = unittest.TestSuite()

searx/tests/test_webapp.py+2−4

@@ -1,12 +1,10 @@

11# -*- coding: utf-8 -*-

3+import json

4+from urlparse import ParseResult

35from mock import patch

46from searx import webapp

57from searx.testing import SearxTestCase

6−from urlparse import ParseResult

7−

8−

9−import json

108

119

1210class ViewsTestCase(SearxTestCase):

searx/webapp.py+9−13

@@ -21,22 +21,18 @@ import json

2121import cStringIO

2222import os

2323

24−from flask import Flask, request, render_template

25−from flask import url_for, Response, make_response, redirect

26−from flask import send_from_directory

27−

24+from flask import (

25+ Flask, request, render_template, url_for, Response, make_response,

26+ redirect, send_from_directory

27+)

28+from flask.ext.babel import Babel

2829from searx import settings, searx_dir

29−from searx.engines import search

30−from searx.engines import categories

31−from searx.engines import engines

32−from searx.engines import get_engines_stats

33−from searx.engines import engine_shortcuts

34−from searx.utils import UnicodeWriter

35−from searx.utils import highlight_content, html_to_text

30+from searx.engines import (

31+ search, categories, engines, get_engines_stats, engine_shortcuts

32+)

33+from searx.utils import UnicodeWriter, highlight_content, html_to_text

3634from searx.languages import language_codes

3735

38−from flask.ext.babel import Babel

39−

4036

4137app = Flask(

4238 __name__,