OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

Make Python 3 able to read settings files with Unicode characters

Browse source 
SearX currently doesn't start up when run with Python 3 as it tries to parse the
settings.yml file with ASCII codecs.
There are similar problems with engines_languages.json and currencies.json
Python 3 requires that files with Unicode characters be read with a 'b' flag.
This also works with Python 2 and hence can be integrated into the main source
code.

Tested with the latest Python 3.6.4rc1 on Debian unstable.

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
This commit is contained in:
Joseph Nuthalapati 2017-12-19 13:04:18 +05:30
parent 943404a103
commit bdc803e185
No known key found for this signature in database
GPG key ID: 5398F00A2FA43C35
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
searx/__init__.py
View file

@ -50,7 +50,7 @@ if not settings_path:
raise Exception('settings.yml not found') raise Exception('settings.yml not found')
# load settings # load settings
with open(settings_path) as settings_yaml: with open(settings_path, 'rb') as settings_yaml:
settings = load(settings_yaml) settings = load(settings_yaml)
''' '''

2
searx/engines/__init__.py
View file

@ -36,7 +36,7 @@ engines = {}
categories = {'general': []} categories = {'general': []}
languages = loads(open(engine_dir + '/../data/engines_languages.json').read()) languages = loads(open(engine_dir + '/../data/engines_languages.json', 'rb').read())
engine_shortcuts = {} engine_shortcuts = {}
engine_default_args = {'paging': False, engine_default_args = {'paging': False,

2
searx/engines/currency_convert.py
View file

@ -94,7 +94,7 @@ def load():
global db global db
current_dir = os.path.dirname(os.path.realpath(__file__)) current_dir = os.path.dirname(os.path.realpath(__file__))
json_data = open(current_dir + "/../data/currencies.json").read() json_data = open(current_dir + "/../data/currencies.json", 'rb').read()
db = json.loads(json_data) db = json.loads(json_data)