Issue 2576 - Use urllib instead urllib2 which isn't bundled with runserver.exe

globals/get_browser_versions.py

 import re
 import os
 import sys
 import json
-import urllib2
+import urllib
 import errno
 import logging
 import time
 from xml.dom import minidom
 
 from jinja2 import contextfunction
 
 BROWSERS = {}
 
 CHROME_UPDATE_XML = '''\
 <?xml version="1.0" encoding="UTF-8"?>
 <request protocol="3.0" ismachine="0">
   <os platform="win" version="99" arch="x64"/>
   <app appid="{4DC8B4CA-1BDA-483E-B5FA-D3C12E15B62D}">
     <updatecheck/>
   </app>
   <app appid="{4DC8B4CA-1BDA-483E-B5FA-D3C12E15B62D}" ap="x64-beta-multi-chrome">
     <updatecheck/>
   </app>
   <app appid="{4DC8B4CA-1BDA-483E-B5FA-D3C12E15B62D}" ap="x64-dev-multi-chrome">
     <updatecheck/>
   </app>
 </request>'''
 
 cache = {}
 
 def get_mozilla_version(product, origin_version, channel,
                         minor=False, subdomain='aus4', origin_build='-',
                         attribute='appVersion', platform='WINNT_x86-msvc'):
-  response = urllib2.urlopen('https://%s.mozilla.org/update/3/%s/%s/%s/%s/en-US/%s/-/default/default/update.xml?force=1' % (
+  response = urllib.urlopen('https://%s.mozilla.org/update/3/%s/%s/%s/%s/en-US/%s/-/default/default/update.xml?force=1' % (
     subdomain,
     product,
     origin_version,
     origin_build,
     platform,
     channel
   ))
   try:
     doc = minidom.parse(response)
   finally:
@@ skipping 41 matching lines @@
     versions['unreleased'].append(version)
 
   return versions
 
 BROWSERS['seamonkey'] = get_seamonkey_versions
 
 def get_chrome_version(manifest):
   return manifest.getAttribute('version').split('.')[0]
 
 def get_chrome_versions():
-  response = urllib2.urlopen(urllib2.Request('https://tools.google.com/service/update2', CHROME_UPDATE_XML))
+  response = urllib.urlopen('https://tools.google.com/service/update2', CHROME_UPDATE_XML)
   try:
     doc = minidom.parse(response)
   finally:
     response.close()
 
   manifests = doc.getElementsByTagName('manifest')
   return {
     'current': get_chrome_version(manifests[0]),
     'unreleased': map(get_chrome_version, manifests[1:])
   }
 
 BROWSERS['chrome'] = get_chrome_versions
 
 def get_opera_version(channel):
-  response = urllib2.urlopen('https://autoupdate.geo.opera.com/netinstaller/' + channel)
+  response = urllib.urlopen('https://autoupdate.geo.opera.com/netinstaller/' + channel)
   try:
     spec = json.load(response)
   finally:
     response.close()
 
   return re.search(r'\d+', spec['installer_filename']).group(0)
 
 def get_opera_versions():
   return {
     'current': get_opera_version('Stable'),
     'unreleased': [
       get_opera_version('Beta'),
       get_opera_version('Developer')
     ]
   }
 
 BROWSERS['opera'] = get_opera_versions
 
 def get_yandex_version(suffix):
-  response = urllib2.urlopen('https://api.browser.yandex.ru/update-info/browser/yandex%s/win-yandex.xml' % suffix)
+  response = urllib.urlopen('https://api.browser.yandex.ru/update-info/browser/yandex%s/win-yandex.xml' % suffix)
   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_versions():
@@ skipping 74 matching lines @@
       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