summaryrefslogtreecommitdiff
path: root/searx/plugins
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2016-07-04 22:46:43 +0200
committerAdam Tauber <asciimoo@gmail.com>2016-07-04 22:46:43 +0200
commit257e52954a407c41b9b758d56fba684903a7c0b4 (patch)
tree589dd26cc5d3fd53079b1df0577f50bd0e8577c6 /searx/plugins
parentbd48f34dbdc6cb1d2f76554539c32055297e9114 (diff)
downloadsearxng-257e52954a407c41b9b758d56fba684903a7c0b4.tar.gz
searxng-257e52954a407c41b9b758d56fba684903a7c0b4.zip
[enh][fix] update to latest dependencies ++ fix tests & travis test runner
WARNING: dependency changes
Diffstat (limited to 'searx/plugins')
-rw-r--r--searx/plugins/__init__.py4
-rw-r--r--searx/plugins/https_rewrite.py2
-rw-r--r--searx/plugins/open_results_on_new_tab.py2
-rw-r--r--searx/plugins/search_on_category_select.py2
-rw-r--r--searx/plugins/self_info.py2
-rw-r--r--searx/plugins/tracker_url_remover.py2
-rw-r--r--searx/plugins/vim_hotkeys.py2
7 files changed, 8 insertions, 8 deletions
diff --git a/searx/plugins/__init__.py b/searx/plugins/__init__.py
index efb9b0682..b9b9ca0d0 100644
--- a/searx/plugins/__init__.py
+++ b/searx/plugins/__init__.py
@@ -26,8 +26,8 @@ from searx.plugins import (https_rewrite,
tracker_url_remover,
vim_hotkeys)
-required_attrs = (('name', str),
- ('description', str),
+required_attrs = (('name', (str, unicode)),
+ ('description', (str, unicode)),
('default_on', bool))
optional_attrs = (('js_dependencies', tuple),
diff --git a/searx/plugins/https_rewrite.py b/searx/plugins/https_rewrite.py
index 0a58cc85d..8c29520d2 100644
--- a/searx/plugins/https_rewrite.py
+++ b/searx/plugins/https_rewrite.py
@@ -21,7 +21,7 @@ from lxml import etree
from os import listdir, environ
from os.path import isfile, isdir, join
from searx.plugins import logger
-from flask.ext.babel import gettext
+from flask_babel import gettext
from searx import searx_dir
diff --git a/searx/plugins/open_results_on_new_tab.py b/searx/plugins/open_results_on_new_tab.py
index 5ebece142..ae27ea277 100644
--- a/searx/plugins/open_results_on_new_tab.py
+++ b/searx/plugins/open_results_on_new_tab.py
@@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2016 by Adam Tauber, <asciimoo@gmail.com>
'''
-from flask.ext.babel import gettext
+from flask_babel import gettext
name = gettext('Open result links on new browser tabs')
description = gettext('Results are opened in the same window by default. '
'This plugin overwrites the default behaviour to open links on new tabs/windows. '
diff --git a/searx/plugins/search_on_category_select.py b/searx/plugins/search_on_category_select.py
index 53585faea..f72c63d76 100644
--- a/searx/plugins/search_on_category_select.py
+++ b/searx/plugins/search_on_category_select.py
@@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com>
'''
-from flask.ext.babel import gettext
+from flask_babel import gettext
name = gettext('Search on category select')
description = gettext('Perform search immediately if a category selected. '
'Disable to select multiple categories. (JavaScript required)')
diff --git a/searx/plugins/self_info.py b/searx/plugins/self_info.py
index dc6b7cd0e..75cbae0de 100644
--- a/searx/plugins/self_info.py
+++ b/searx/plugins/self_info.py
@@ -14,7 +14,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com>
'''
-from flask.ext.babel import gettext
+from flask_babel import gettext
import re
name = "Self Informations"
description = gettext('Displays your IP if the query is "ip" and your user agent if the query contains "user agent".')
diff --git a/searx/plugins/tracker_url_remover.py b/searx/plugins/tracker_url_remover.py
index ed71c94d3..b909e3fae 100644
--- a/searx/plugins/tracker_url_remover.py
+++ b/searx/plugins/tracker_url_remover.py
@@ -15,7 +15,7 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
(C) 2015 by Adam Tauber, <asciimoo@gmail.com>
'''
-from flask.ext.babel import gettext
+from flask_babel import gettext
import re
from urlparse import urlunparse
diff --git a/searx/plugins/vim_hotkeys.py b/searx/plugins/vim_hotkeys.py
index e537a3ac8..8f06f1343 100644
--- a/searx/plugins/vim_hotkeys.py
+++ b/searx/plugins/vim_hotkeys.py
@@ -1,4 +1,4 @@
-from flask.ext.babel import gettext
+from flask_babel import gettext
name = gettext('Vim-like hotkeys')
description = gettext('Navigate search results with Vim-like hotkeys '