From 58a8cd1bb943522bc53d02c008ee8eff798bfaaa Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 13 May 2012 18:53:50 -0700 Subject: Revert "Bug #413983: Add portage.util.urlopen(), which transparently handles authentication in the way compatible with Python 3." This reverts commit 0a9cc38a66ded0cf0e5b534cb24b970fc9c21920. As reported in bug #415579, that commit broke FTP authentication. --- pym/portage/util/__init__.py | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'pym/portage/util/__init__.py') diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index 2b50733c5..57e8c37b7 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -26,14 +26,6 @@ import string import sys import traceback import glob -try: - import urllib.parse as urllib_parse - import urllib.request as urllib_request - from urllib.parse import splituser as urllib_parse_splituser -except ImportError: - import urlparse as urllib_parse - import urllib2 as urllib_request - from urllib import splituser as urllib_parse_splituser import portage portage.proxy.lazyimport.lazyimport(globals(), @@ -1648,14 +1640,3 @@ def getlibpaths(root, env=None): rval.append("/lib") return [normalize_path(x) for x in rval if x] - -def urlopen(url): - parse_result = urllib_parse.urlparse(url) - netloc = urllib_parse_splituser(parse_result.netloc)[1] - url = urllib_parse.urlunparse((parse_result.scheme, netloc, parse_result.path, parse_result.params, parse_result.query, parse_result.fragment)) - password_manager = urllib_request.HTTPPasswordMgrWithDefaultRealm() - if parse_result.username is not None: - password_manager.add_password(None, url, parse_result.username, parse_result.password) - auth_handler = urllib_request.HTTPBasicAuthHandler(password_manager) - opener = urllib_request.build_opener(auth_handler) - return opener.open(url) -- cgit v1.2.3-1-g7c22