9eb31c0 · searx · git.iko.soy

git.iko.soy/searx

[fix] unicode and pep8 fixes

commit9eb31c01868ee9d0cf7f5403cb1dd38364d5da6b authorasciimoo <asciimoo@gmail.com> dateFri 7 Feb 2014, 02:45 (13 years ago) parent4d87899

3 files changed+11−8

compare with master

unifiedsplit

searx/engines/__init__.py+1−1 searx/search.py+2−2 searx/webapp.py+8−5

searx/engines/__init__.py+1−1

@@ -205,7 +205,7 @@ def search(query, request, selected_engines, pageno=1, lang='all'):

205205 request_params['started'] = datetime.now()

206206 request_params['pageno'] = pageno

207207 request_params['language'] = lang

208− request_params = engine.request(query, request_params)

208+ request_params = engine.request(query.encode('utf-8'), request_params)

209209

210210 callback = make_callback(

211211 selected_engine['name'],

searx/search.py+2−2

@@ -18,7 +18,7 @@ class Search(object):

1818 self.pageno = 1

1919 self.lang = 'all'

2020 if request.cookies.get('blocked_engines'):

21− self.blocked_engines = request.cookies['blocked_engines'].split(',')

21+ self.blocked_engines = request.cookies['blocked_engines'].split(',') # noqa

2222 else:

2323 self.blocked_engines = []

2424 self.results = []

@@ -70,7 +70,7 @@ class Search(object):

7070

7171 if len(self.engines):

7272 self.categories = list(set(engine['category']

73− for engine in self.engines))

73+ for engine in self.engines))

7474 else:

7575 for pd_name, pd in self.request_data.items():

7676 if pd_name.startswith('category_'):

searx/webapp.py+8−5

@@ -120,8 +120,10 @@ def index():

120120 search.paging = True

121121 if search.request_data.get('format', 'html') == 'html':

122122 if 'content' in result:

123− result['content'] = highlight_content(result['content'], search.query)

124− result['title'] = highlight_content(result['title'], search.query)

123+ result['content'] = highlight_content(result['content'],

124+ search.query.encode('utf-8')) # noqa

125+ result['title'] = highlight_content(result['title'],

126+ search.query.encode('utf-8'))

125127 else:

126128 if 'content' in result:

127129 result['content'] = html_to_text(result['content']).strip()

@@ -139,7 +141,8 @@ def index():

139141 result['favicon'] = engine

140142

141143 if search.request_data.get('format') == 'json':

142− return Response(json.dumps({'query': search.query, 'results': search.results}),

144+ return Response(json.dumps({'query': search.query,

145+ 'results': search.results}),

143146 mimetype='application/json')

144147 elif search.request_data.get('format') == 'csv':

145148 csv = UnicodeWriter(cStringIO.StringIO())

@@ -151,8 +154,8 @@ def index():

151154 csv.writerow([row.get(key, '') for key in keys])

152155 csv.stream.seek(0)

153156 response = Response(csv.stream.read(), mimetype='application/csv')

154− content_disp = 'attachment;Filename=searx_-_{0}.csv'.format(search.query)

155− response.headers.add('Content-Disposition', content_disp)

157+ cont_disp = 'attachment;Filename=searx_-_{0}.csv'.format(search.query)

158+ response.headers.add('Content-Disposition', cont_disp)

156159 return response

157160 elif search.request_data.get('format') == 'rss':

158161 response_rss = render(