diff options
| author | asciimoo <asciimoo@gmail.com> | 2014-02-07 02:45:12 +0100 |
|---|---|---|
| committer | asciimoo <asciimoo@gmail.com> | 2014-02-07 02:45:12 +0100 |
| commit | 9eb31c01868ee9d0cf7f5403cb1dd38364d5da6b (patch) | |
| tree | 78027d087598a5512684d83a438788c67b158914 /searx/webapp.py | |
| parent | 4d878993bd8144457eb94b94ed5f39e3a1ac0190 (diff) | |
[fix] unicode and pep8 fixes
Diffstat (limited to 'searx/webapp.py')
| -rw-r--r-- | searx/webapp.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/searx/webapp.py b/searx/webapp.py index 43f5021b0..5d5ac2187 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -120,8 +120,10 @@ def index(): search.paging = True if search.request_data.get('format', 'html') == 'html': if 'content' in result: - result['content'] = highlight_content(result['content'], search.query) - result['title'] = highlight_content(result['title'], search.query) + result['content'] = highlight_content(result['content'], + search.query.encode('utf-8')) # noqa + result['title'] = highlight_content(result['title'], + search.query.encode('utf-8')) else: if 'content' in result: result['content'] = html_to_text(result['content']).strip() @@ -139,7 +141,8 @@ def index(): result['favicon'] = engine if search.request_data.get('format') == 'json': - return Response(json.dumps({'query': search.query, 'results': search.results}), + return Response(json.dumps({'query': search.query, + 'results': search.results}), mimetype='application/json') elif search.request_data.get('format') == 'csv': csv = UnicodeWriter(cStringIO.StringIO()) @@ -151,8 +154,8 @@ def index(): csv.writerow([row.get(key, '') for key in keys]) csv.stream.seek(0) response = Response(csv.stream.read(), mimetype='application/csv') - content_disp = 'attachment;Filename=searx_-_{0}.csv'.format(search.query) - response.headers.add('Content-Disposition', content_disp) + cont_disp = 'attachment;Filename=searx_-_{0}.csv'.format(search.query) + response.headers.add('Content-Disposition', cont_disp) return response elif search.request_data.get('format') == 'rss': response_rss = render( |