From 50c836864a9a7a765561d886b11f44d8cea0bce9 Mon Sep 17 00:00:00 2001
From: Alex <alex@al-f.net>
Date: Sun, 5 Aug 2018 10:55:42 +0200
Subject: fetch_firefox_version.py : compatible with Python 3 and minor fixes.

---
 searx/data/useragents.json | 19 +++++++++----------
 searx/utils.py             |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'searx')

diff --git a/searx/data/useragents.json b/searx/data/useragents.json
index ba80ce885..850bc418a 100644
--- a/searx/data/useragents.json
+++ b/searx/data/useragents.json
@@ -1,15 +1,14 @@
 {
+    "ua": "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}",
+    "versions": [
+        "61.0.1",
+        "61.0",
+        "60.0.2",
+        "60.0.1",
+        "60.0"
+    ],
     "os": [
-        "Windows NT 10; WOW64", 
+        "Windows NT 10; WOW64",
         "X11; Linux x86_64"
-    ], 
-    "ua": "Mozilla/5.0 ({os}; rv:{version}) Gecko/20100101 Firefox/{version}", 
-    "versions": [
-        "59.0.2", 
-        "59.0.1", 
-        "59.0", 
-        "58.0.2", 
-        "58.0.1", 
-        "58.0"
     ]
 }
\ No newline at end of file
diff --git a/searx/utils.py b/searx/utils.py
index f457284e3..dfa22c5fc 100644
--- a/searx/utils.py
+++ b/searx/utils.py
@@ -54,8 +54,8 @@ def searx_useragent():
            suffix=settings['outgoing'].get('useragent_suffix', ''))
 
 
-def gen_useragent():
-    return str(useragents['ua'].format(os=choice(useragents['os']), version=choice(useragents['versions'])))
+def gen_useragent(os=None):
+    return str(useragents['ua'].format(os=os or choice(useragents['os']), version=choice(useragents['versions'])))
 
 
 def highlight_content(content, query):
-- 
cgit v1.2.3