@@ -26,6 +26,7 @@ import json
26import cStringIO
26import cStringIO
28import hashlib
28import hashlib
30from searx import logger
31from searx import logger
31logger = logger.getChild('webapp')
32logger = logger.getChild('webapp')
@@ -48,7 +49,6 @@ from flask import (
49from flask.ext.babel import Babel, gettext, format_date
50from flask.ext.babel import Babel, gettext, format_date
50from searx import settings, searx_dir
51from searx import settings, searx_dir
51−from searx.poolrequests import get as http_get
52from searx.engines import (
52from searx.engines import (
53 categories, engines, get_engines_stats, engine_shortcuts
53 categories, engines, get_engines_stats, engine_shortcuts
@@ -632,10 +632,10 @@ def image_proxy():
632 headers = dict_subset(request.headers, {'If-Modified-Since', 'If-None-Match'})
632 headers = dict_subset(request.headers, {'If-Modified-Since', 'If-None-Match'})
633 headers['User-Agent'] = gen_useragent()
633 headers['User-Agent'] = gen_useragent()
635− resp = http_get(url,
635+ resp = requests.get(url,
636− stream=True,
636+ stream=True,
637− timeout=settings['server'].get('request_timeout', 2),
637+ timeout=settings['server'].get('request_timeout', 2),
638− headers=headers)
638+ headers=headers)
640 if resp.status_code == 304:
640 if resp.status_code == 304:
641 return '', resp.status_code
641 return '', resp.status_code