9eb31c0 · searx · git.iko.soy

git.iko.soy/searx

on master help sign in

[fix] unicode and pep8 fixes

9eb31c0asciimoo13 years ago

searx/engines/__init__.py+1−1

compare with master

unifiedsplit

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

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

206 request_params['pageno'] = pageno

207 request_params['language'] = lang

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

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

209

210 callback = make_callback(

211 selected_engine['name'],

searx/search.py+2−2

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

18 self.pageno = 1

19 self.lang = 'all'

20 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

22 else:

23 self.blocked_engines = []

24 self.results = []

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

71 if len(self.engines):

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

73− for engine in self.engines))

73+ for engine in self.engines))

74 else:

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

76 if pd_name.startswith('category_'):

searx/webapp.py+8−5

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

120 search.paging = True

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

122 if 'content' in result:

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

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

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

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

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

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

125 else:

127 else:

126 if 'content' in result:

128 if 'content' in result:

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

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

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

139 result['favicon'] = engine

141 result['favicon'] = engine

140

142

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

143 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}),

143 mimetype='application/json')

146 mimetype='application/json')

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

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

145 csv = UnicodeWriter(cStringIO.StringIO())

148 csv = UnicodeWriter(cStringIO.StringIO())

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

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

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

152 csv.stream.seek(0)

155 csv.stream.seek(0)

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

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

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

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

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

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

156 return response

159 return response

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

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

158 response_rss = render(

161 response_rss = render(