b8d836e · searx · git.iko.soy

searx/engines/__init__.py+4−4

compare with master

unifiedsplit

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

17'''

18

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

20+import sys

20from imp import load_source

21from imp import load_source

21−import grequests

22from itertools import izip_longest, chain

23from operator import itemgetter

24from urlparse import urlparse

25−from searx import settings

26−from searx.utils import gen_useragent

27−import sys

28from datetime import datetime

25from datetime import datetime

26+import grequests

29from flask.ext.babel import gettext

27from flask.ext.babel import gettext

28+from searx import settings

29+from searx.utils import gen_useragent

30

31engine_dir = dirname(realpath(__file__))

32

searx/engines/bing.py+1−1

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

1−from lxml import html

2from urllib import urlencode

1from urllib import urlencode

3from cgi import escape

2from cgi import escape

3+from lxml import html

4

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

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

searx/engines/dailymotion.py+1−1

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

1from urllib import urlencode

2−from lxml import html

3from json import loads

2from json import loads

3+from lxml import html

4

5categories = ['videos']

6locale = 'en_US'

searx/engines/deviantart.py+1−1

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

1from urllib import urlencode

2−from lxml import html

3from urlparse import urljoin

2from urlparse import urljoin

3+from lxml import html

4

5categories = ['images']

6

searx/engines/piratebay.py+1−1

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

1−from lxml import html

2from urlparse import urljoin

1from urlparse import urljoin

3from cgi import escape

2from cgi import escape

4from urllib import quote

3from urllib import quote

4+from lxml import html

5

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

7

searx/engines/stackoverflow.py+1−1

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

1−from lxml import html

2from urlparse import urljoin

1from urlparse import urljoin

3from cgi import escape

2from cgi import escape

4from urllib import urlencode

3from urllib import urlencode

4+from lxml import html

5

6categories = ['it']

7

searx/engines/vimeo.py+1−1

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

1from urllib import urlencode

2from HTMLParser import HTMLParser

3−from xpath import extract_text

4from lxml import html

3from lxml import html

4+from xpath import extract_text

5

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

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

searx/engines/yahoo.py+1−1

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

1#!/usr/bin/env python

2

3from urllib import urlencode

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

5from lxml import html

4from lxml import html

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

6

7categories = ['general']

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

searx/engines/youtube.py+2−1

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

3

4categories = ['videos']

5

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

7

8

8paging = True

9paging = True

9

10

searx/tests/test_robot.py+2−3

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

1# -*- coding: utf-8 -*-

2

3+import os

4+import unittest2 as unittest

3from plone.testing import layered

5from plone.testing import layered

4from robotsuite import RobotTestSuite

6from robotsuite import RobotTestSuite

5from searx.testing import SEARXROBOTLAYER

7from searx.testing import SEARXROBOTLAYER

6

8

7−import os

8−import unittest2 as unittest

9−

10

9

11def test_suite():

10def test_suite():

12 suite = unittest.TestSuite()

11 suite = unittest.TestSuite()

searx/tests/test_webapp.py+2−4

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

1# -*- coding: utf-8 -*-

2

3+import json

4+from urlparse import ParseResult

3from mock import patch

5from mock import patch

4from searx import webapp

6from searx import webapp

5from searx.testing import SearxTestCase

7from searx.testing import SearxTestCase

6−from urlparse import ParseResult

7−

8−

9−import json

10

8

11

9

12class ViewsTestCase(SearxTestCase):

10class ViewsTestCase(SearxTestCase):

searx/webapp.py+9−13

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

21import cStringIO

22import os

23

24+from flask import (

24−from flask import Flask, request, render_template

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

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

26−from flask import send_from_directory

26+ redirect, send_from_directory

27−

27+)

28+from flask.ext.babel import Babel

28from searx import settings, searx_dir

29from searx import settings, searx_dir

29−from searx.engines import search

30+from searx.engines import (

30−from searx.engines import categories

31+ search, categories, engines, get_engines_stats, engine_shortcuts

31−from searx.engines import engines

32+)

32−from searx.engines import get_engines_stats

33−from searx.engines import engine_shortcuts

34−from searx.utils import UnicodeWriter

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

35−from searx.utils import highlight_content, html_to_text

36from searx.languages import language_codes

34from searx.languages import language_codes

37

35

38−from flask.ext.babel import Babel

39−

40

36

41app = Flask(

37app = Flask(

42 __name__,

38 __name__,