commit: c366e1a755ed4d6b49883b8d8b20629fe32b6b43
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 05:46:53 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 05:59:07 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c366e1a7
urlopen: eliminate deprecated urllib.parse.splituser
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/portage/util/_urlopen.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/portage/util/_urlopen.py b/lib/portage/util/_urlopen.py
index fc9db74a0..1d8ba3fd3 100644
--- a/lib/portage/util/_urlopen.py
+++ b/lib/portage/util/_urlopen.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2014 Gentoo Foundation
+# Copyright 2012-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import io
@@ -11,12 +11,10 @@ try:
from urllib.request import urlopen as _urlopen
import urllib.parse as urllib_parse
import urllib.request as urllib_request
- from urllib.parse import splituser as urllib_parse_splituser
except ImportError:
from urllib import urlopen as _urlopen
import urlparse as urllib_parse
import urllib2 as urllib_request
- from urllib import splituser as urllib_parse_splituser
if sys.hexversion >= 0x3000000:
# pylint: disable=W0622
@@ -43,7 +41,7 @@ def urlopen(url, if_modified_since=None):
if parse_result.scheme not in ("http", "https"):
return _urlopen(url)
else:
- netloc = urllib_parse_splituser(parse_result.netloc)[1]
+ netloc = parse_result.netloc.rpartition('@')[-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()
request = urllib_request.Request(url)
