diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2015-05-02 13:39:13 -0400 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2015-05-02 13:39:13 -0400 |
| commit | b3513aa3a6db41420e311bf5fc169f11564bc4e5 (patch) | |
| tree | ad001843ab3d034e72a7b23fe87147c5b8dd7691 /searx | |
| parent | 59a65d0bdc98a76f03235055f214747f699923a9 (diff) | |
| parent | 6cd9a045f87bc5143d186d309bcd351b7f0bf5cf (diff) | |
Merge pull request #307 from dalf/master
[fix] Flickr engine
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/engines/flickr_noapi.py | 4 | ||||
| -rw-r--r-- | searx/utils.py | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/searx/engines/flickr_noapi.py b/searx/engines/flickr_noapi.py index 3a83fdc65..f24521e7f 100644 --- a/searx/engines/flickr_noapi.py +++ b/searx/engines/flickr_noapi.py @@ -20,8 +20,8 @@ logger = logger.getChild('flickr-noapi') categories = ['images'] -url = 'https://secure.flickr.com/' -search_url = url + 'search/?{query}&page={page}' +url = 'https://www.flickr.com/' +search_url = url + 'search?{query}&page={page}' photo_url = 'https://www.flickr.com/photos/{userid}/{photoid}' regex = re.compile(r"\"search-photos-models\",\"photos\":(.*}),\"totalItems\":", re.DOTALL) image_sizes = ('o', 'k', 'h', 'b', 'c', 'z', 'n', 'm', 't', 'q', 's') diff --git a/searx/utils.py b/searx/utils.py index e6c107e24..129971e31 100644 --- a/searx/utils.py +++ b/searx/utils.py @@ -17,17 +17,16 @@ from searx import logger logger = logger.getChild('utils') -ua_versions = ('31.0', - '32.0', - '33.0', +ua_versions = ('33.0', '34.0', - '35.0') + '35.0', + '36.0', + '37.0') ua_os = ('Windows NT 6.3; WOW64', 'X11; Linux x86_64', 'X11; Linux x86') - -ua = "Mozilla/5.0 ({os}) Gecko/20100101 Firefox/{version}" +ua = "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}" blocked_tags = ('script', 'style') |