From 1f7627fd3ccab0fbab88ad2d082b67f5719af92c Mon Sep 17 00:00:00 2001 From: Sarah Owens Date: Wed, 31 Oct 2012 09:21:55 -0700 Subject: Use python3 urllib when urllib2 not available This is part of a series of changes to introduce Python3 support. Change-Id: I605b145791053c1f2d7bf3c907c5a68649b21d12 --- repo | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'repo') diff --git a/repo b/repo index 7c633fc3..060ea6d1 100755 --- a/repo +++ b/repo @@ -122,7 +122,18 @@ import os import re import subprocess import sys -import urllib2 +try: + import urllib2 +except ImportError: + # For python3 + import urllib.request + import urllib.error +else: + # For python2 + import imp + urllib = imp.new_module('urllib') + urllib.request = urllib2 + urllib.error = urllib2 home_dot_repo = os.path.expanduser('~/.repoconfig') gpg_dir = os.path.join(home_dot_repo, 'gnupg') @@ -355,7 +366,7 @@ def _SetConfig(local, name, value): def _InitHttp(): handlers = [] - mgr = urllib2.HTTPPasswordMgrWithDefaultRealm() + mgr = urllib.request.HTTPPasswordMgrWithDefaultRealm() try: import netrc n = netrc.netrc() @@ -365,16 +376,16 @@ def _InitHttp(): mgr.add_password(p[1], 'https://%s/' % host, p[0], p[2]) except: pass - handlers.append(urllib2.HTTPBasicAuthHandler(mgr)) - handlers.append(urllib2.HTTPDigestAuthHandler(mgr)) + handlers.append(urllib.request.HTTPBasicAuthHandler(mgr)) + handlers.append(urllib.request.HTTPDigestAuthHandler(mgr)) if 'http_proxy' in os.environ: url = os.environ['http_proxy'] - handlers.append(urllib2.ProxyHandler({'http': url, 'https': url})) + handlers.append(urllib.request.ProxyHandler({'http': url, 'https': url})) if 'REPO_CURL_VERBOSE' in os.environ: - handlers.append(urllib2.HTTPHandler(debuglevel=1)) - handlers.append(urllib2.HTTPSHandler(debuglevel=1)) - urllib2.install_opener(urllib2.build_opener(*handlers)) + handlers.append(urllib.request.HTTPHandler(debuglevel=1)) + handlers.append(urllib.request.HTTPSHandler(debuglevel=1)) + urllib.request.install_opener(urllib.request.build_opener(*handlers)) def _Fetch(url, local, src, quiet): if not quiet: @@ -423,14 +434,14 @@ def _DownloadBundle(url, local, quiet): dest = open(os.path.join(local, '.git', 'clone.bundle'), 'w+b') try: try: - r = urllib2.urlopen(url) - except urllib2.HTTPError as e: + r = urllib.request.urlopen(url) + except urllib.error.HTTPError as e: if e.code == 404: return False print >>sys.stderr, 'fatal: Cannot get %s' % url print >>sys.stderr, 'fatal: HTTP error %s' % e.code raise CloneFailure() - except urllib2.URLError as e: + except urllib.error.URLError as e: print >>sys.stderr, 'fatal: Cannot get %s' % url print >>sys.stderr, 'fatal: error %s' % e.reason raise CloneFailure() -- cgit v1.2.3-54-g00ecf