jandieman
/
searxng
mirror of https://github.com/searxng/searxng.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #617 from stepshal/whitespaces 

Fix whitespaces
This commit is contained in:
Adam Tauber 2016-07-11 14:07:59 +02:00 committed by GitHub
parent baab6bcb91 d9231d173a
commit a92493a0de
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/basic_engine.py
View File

@ -1,5 +1,5 @@
categories = ['general'] # optional categories = ['general'] # optional
def request(query, params): def request(query, params):

2
utils/fabfile.py vendored
View File

@ -89,7 +89,7 @@ def init():
sudo('git clone https://github.com/asciimoo/searx') sudo('git clone https://github.com/asciimoo/searx')
sudo('chown -R {user}:{user} {searx_dir}'.format(user=current_user, searx_dir=searx_dir)) sudo('chown -R {user}:{user} {searx_dir}'.format(user=current_user, searx_dir=searx_dir))
put(StringIO(uwsgi_file), searx_dir+'/uwsgi.ini') put(StringIO(uwsgi_file), searx_dir + '/uwsgi.ini')
sudo('ln -s {0}/uwsgi.ini /etc/uwsgi/apps-enabled/searx.ini'.format(searx_dir)) sudo('ln -s {0}/uwsgi.ini /etc/uwsgi/apps-enabled/searx.ini'.format(searx_dir))
run('virtualenv {0}'.format(searx_ve_dir)) run('virtualenv {0}'.format(searx_ve_dir))

18
utils/fetch_currencies.py
View File

@ -10,17 +10,17 @@ languages = {'de', 'en', 'es', 'fr', 'hu', 'it', 'nl', 'jp'}
url_template = 'https://www.wikidata.org/w/api.php?action=wbgetentities&format=json&{query}&props=labels%7Cdatatype%7Cclaims%7Caliases&languages=' + '|'.join(languages) url_template = 'https://www.wikidata.org/w/api.php?action=wbgetentities&format=json&{query}&props=labels%7Cdatatype%7Cclaims%7Caliases&languages=' + '|'.join(languages)
url_wmflabs_template = 'http://wdq.wmflabs.org/api?q=' url_wmflabs_template = 'http://wdq.wmflabs.org/api?q='
url_wikidata_search_template='http://www.wikidata.org/w/api.php?action=query&list=search&format=json&srnamespace=0&srprop=sectiontitle&{query}' url_wikidata_search_template = 'http://www.wikidata.org/w/api.php?action=query&list=search&format=json&srnamespace=0&srprop=sectiontitle&{query}'
wmflabs_queries = [ wmflabs_queries = [
'CLAIM[31:8142]', # all devise 'CLAIM[31:8142]', # all devise
] ]
db = { db = {
'iso4217' : { 'iso4217': {
}, },
'names' : { 'names': {
} }
} }
@ -29,7 +29,7 @@ def remove_accents(data):
def normalize_name(name): def normalize_name(name):
return re.sub(' +',' ', remove_accents(name.lower()).replace('-', ' ')) return re.sub(' +', ' ', remove_accents(name.lower()).replace('-', ' '))
def add_currency_name(name, iso4217): def add_currency_name(name, iso4217):
@ -51,7 +51,7 @@ def add_currency_name(name, iso4217):
if iso4217_set is not None and iso4217 not in iso4217_set: if iso4217_set is not None and iso4217 not in iso4217_set:
db_names[name].append(iso4217) db_names[name].append(iso4217)
else: else:
db_names[name] = [ iso4217 ] db_names[name] = [iso4217]
def add_currency_label(label, iso4217, language): def add_currency_label(label, iso4217, language):
@ -96,7 +96,7 @@ def parse_currency(data):
def fetch_data(wikidata_ids): def fetch_data(wikidata_ids):
url = url_template.format(query=urlencode({'ids' : '|'.join(wikidata_ids)})) url = url_template.format(query=urlencode({'ids': '|'.join(wikidata_ids)}))
htmlresponse = get(url) htmlresponse = get(url)
jsonresponse = json.loads(htmlresponse.content) jsonresponse = json.loads(htmlresponse.content)
entities = jsonresponse.get('entities', {}) entities = jsonresponse.get('entities', {})