Issue 2628 - Fix stable version of Yandex.Browser listed on the requirements page

globals/get_browser_versions.py

 import re
 import os
 import sys
 import json
 import urllib
 import errno
 import logging
 import time
 from xml.dom import minidom
 
@@ skipping 110 matching lines @@
   return {
     'current': get_opera_version('Stable'),
     'unreleased': [
       get_opera_version('Beta'),
       get_opera_version('Developer')
     ]
   }
 
 BROWSERS['opera'] = get_opera_versions
 
-def get_yandex_version(beta=False):
-  url = 'https://api.browser.yandex.ru/update-info/browser/yandex%s/win-yandex.xml%s'
-  if beta:
-    url %= ('-beta', '')
-  else:
-    url %= ('', '?manual=yes')
-
-  response = urllib.urlopen(url)
+def key_by_version(version):
+  return map(int, version.split('.'))
+
+def get_yandex_version_raw(suffix, params):
+  response = urllib.urlopen('https://api.browser.yandex.ru/update-info/browser/yandex%s/win-yandex.xml%s' % (suffix, params))
   try:
     doc = minidom.parse(response)
   finally:
     response.close()
 
   item = doc.getElementsByTagName('item')[0]
   description = item.getElementsByTagName('description')[0]
   return re.search(r'\d+\.\d+', description.firstChild.nodeValue).group(0)
 
+def get_yandex_version(suffix=''):
+  return max(
+    get_yandex_version_raw(suffix, ''),
+    get_yandex_version_raw(suffix, '?manual=yes'),
+    key=key_by_version
+  )
+
 def get_yandex_versions():
   return {
     'current': get_yandex_version(),
-    'unreleased': [get_yandex_version(beta=True)]
+    'unreleased': [get_yandex_version('-beta')]
   }
 
 BROWSERS['yandex'] = get_yandex_versions
 
 def open_cache_file(filename):
   flags = os.O_RDWR | os.O_CREAT
   try:
     fd = os.open(filename, flags)
   except OSError as e:
     if e.errno != errno.ENOENT:
@@ skipping 46 matching lines @@
           previous = cached_current
         else:
           previous = cached_versions['previous']
       versions['previous'] = previous
 
       # Remove duplicates from unreleased versions. Occasionally,
       # different channels are on the same version, but we want
       # to list each version only once.
       versions['unreleased'] = sorted(
         set(versions['unreleased']) - {current, previous},
-        key=lambda ver: map(int, ver.split('.'))
+        key=key_by_version
       )
 
       versions['timestamp'] = now
       persistent_cache[browser] = versions
       file.seek(0)
       json.dump(persistent_cache, file)
       file.truncate()
 
   if not versions['previous']:
     logging.warning("Couldn't determine previous browser version, "
                     'please set %s.previous in %s', browser, filename)
 
   cache[browser] = versions
   return versions