forked from Icycoide/searxng
Drop Python 2 (1/n): remove unicode string and url_utils
This commit is contained in:
parent
272158944b
commit
1022228d95
112 changed files with 388 additions and 535 deletions
|
@ -30,8 +30,8 @@ route_re = re.compile('(?:from )?(.+) to (.+)')
|
|||
# do search-request
|
||||
def request(query, params):
|
||||
|
||||
params['url'] = base_url + search_string.format(query=query.decode('utf-8'))
|
||||
params['route'] = route_re.match(query.decode('utf-8'))
|
||||
params['url'] = base_url + search_string.format(query=query.decode())
|
||||
params['route'] = route_re.match(query.decode())
|
||||
|
||||
return params
|
||||
|
||||
|
@ -52,7 +52,7 @@ def response(resp):
|
|||
if 'display_name' not in r:
|
||||
continue
|
||||
|
||||
title = r['display_name'] or u''
|
||||
title = r['display_name'] or ''
|
||||
osm_type = r.get('osm_type', r.get('type'))
|
||||
url = result_base_url.format(osm_type=osm_type,
|
||||
osm_id=r['osm_id'])
|
||||
|
@ -64,7 +64,7 @@ def response(resp):
|
|||
|
||||
# if no geojson is found and osm_type is a node, add geojson Point
|
||||
if not geojson and osm_type == 'node':
|
||||
geojson = {u'type': u'Point', u'coordinates': [r['lon'], r['lat']]}
|
||||
geojson = {'type': 'Point', 'coordinates': [r['lon'], r['lat']]}
|
||||
|
||||
address_raw = r.get('address')
|
||||
address = {}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue