logo

searx

My custom branche(s) on searx, a meta-search engine
commit: baab6bcb9150c765c6e87a558388046ebc419017
parent: 678b87f9d5969668a07c36f9b80be5a5b2d08587
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Mon, 11 Jul 2016 00:07:18 +0200

Merge pull request #616 from stepshal/blank

Fix quantity of blank lines after code object.

Diffstat:

Mexamples/basic_engine.py1+
Msearx/engines/filecrop.py1+
Msearx/preferences.py2++
Msearx/results.py1+
Msearx/utils.py1+
Msearx/webapp.py1+
Mtests/unit/test_preferences.py2++
Mutils/fetch_currencies.py1-
8 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/examples/basic_engine.py b/examples/basic_engine.py @@ -1,6 +1,7 @@ categories = ['general'] # optional + def request(query, params): '''pre-request callback params<dict>: diff --git a/searx/engines/filecrop.py b/searx/engines/filecrop.py @@ -8,6 +8,7 @@ paging = True class FilecropResultParser(HTMLParser): + def __init__(self): HTMLParser.__init__(self) self.__start_processing = False diff --git a/searx/preferences.py b/searx/preferences.py @@ -166,6 +166,7 @@ class SwitchableSetting(Setting): class EnginesSetting(SwitchableSetting): + def _post_init(self): super(EnginesSetting, self)._post_init() transformed_choices = [] @@ -191,6 +192,7 @@ class EnginesSetting(SwitchableSetting): class PluginsSetting(SwitchableSetting): + def _post_init(self): super(PluginsSetting, self)._post_init() transformed_choices = [] diff --git a/searx/results.py b/searx/results.py @@ -91,6 +91,7 @@ def result_score(result): class ResultContainer(object): """docstring for ResultContainer""" + def __init__(self): super(ResultContainer, self).__init__() self.results = defaultdict(list) diff --git a/searx/utils.py b/searx/utils.py @@ -74,6 +74,7 @@ def highlight_content(content, query): class HTMLTextExtractor(HTMLParser): + def __init__(self): HTMLParser.__init__(self) self.result = [] diff --git a/searx/webapp.py b/searx/webapp.py @@ -735,6 +735,7 @@ class ReverseProxyPathFix(object): :param app: the WSGI application ''' + def __init__(self, app): self.app = app diff --git a/tests/unit/test_preferences.py b/tests/unit/test_preferences.py @@ -4,6 +4,7 @@ from searx.testing import SearxTestCase class PluginStub(object): + def __init__(self, id, default_on): self.id = id self.default_on = default_on @@ -11,6 +12,7 @@ class PluginStub(object): class TestSettings(SearxTestCase): # map settings + def test_map_setting_invalid_initialization(self): with self.assertRaises(MissingArgumentException): setting = MapSetting(3, wrong_argument={'0': 0}) diff --git a/utils/fetch_currencies.py b/utils/fetch_currencies.py @@ -37,7 +37,6 @@ def add_currency_name(name, iso4217): db_names = db['names'] - if not isinstance(iso4217, basestring): print "problem", name, iso4217 return