commit: ac250b126b8de24276cd4e9bdc4afab14a9c41e7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Aug 6 23:29:25 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Aug 6 23:29:42 2023 +0000 URL: https://gitweb.gentoo.org/proj/mirrorselect.git/commit/?id=ac250b12
extractor.py: cleanup py2 compat Bug: https://bugs.gentoo.org/911183 Signed-off-by: Sam James <sam <AT> gentoo.org> mirrorselect/mirrorparser3.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mirrorselect/mirrorparser3.py b/mirrorselect/mirrorparser3.py index 444bc11..9bca3e9 100644 --- a/mirrorselect/mirrorparser3.py +++ b/mirrorselect/mirrorparser3.py @@ -48,13 +48,8 @@ class MirrorParser3: if not uri: # Don't parse if empty return None; try: - import sys; - if sys.version_info[0] >= 3: - from urllib.parse import urlparse - return urlparse(uri).scheme - else: - from urllib2 import Request - return Request(uri).get_type() + from urllib.parse import urlparse + return urlparse(uri).scheme except Exception as e: # Add general exception to catch errors from mirrorselect.output import Output Output.write(('_get_proto(): Exception while parsing the protocol '
