From 7ab1e2901d1f1672010f0508dc3001f580cf4a0b Mon Sep 17 00:00:00 2001 From: Yu Ming Zhu Date: Jan 28 2019 13:45:18 +0000 Subject: urllib fix for python3 --- diff --git a/koji/auth.py b/koji/auth.py index de03e03..209aaa1 100644 --- a/koji/auth.py +++ b/koji/auth.py @@ -29,9 +29,9 @@ try: except ImportError: krbV = None import koji -import urlparse #for parse_qs from .context import context from six.moves import range +from six.moves import urllib from six.moves import zip import six from .util import to_list @@ -83,7 +83,7 @@ class Session(object): if not args: self.message = 'no session args' return - args = urlparse.parse_qs(args, strict_parsing=True) + args = urllib.parse.parse_qs(args, strict_parsing=True) hostip = self.get_remote_ip(override=hostip) try: id = int(args['session-id'][0]) diff --git a/koji/daemon.py b/koji/daemon.py index 803f8f1..7d6b4dd 100644 --- a/koji/daemon.py +++ b/koji/daemon.py @@ -31,7 +31,7 @@ from koji.util import md5_constructor, adler32_constructor, parseStatus, \ import os import signal import logging -import urlparse +from six.moves import urllib from fnmatch import fnmatch import base64 import time @@ -258,7 +258,7 @@ class SCM(object): # replace the scheme with http:// so that the urlparse works in all cases dummyurl = self.url.replace(scheme, 'http://', 1) - dummyscheme, netloc, path, params, query, fragment = urlparse.urlparse(dummyurl) + dummyscheme, netloc, path, params, query, fragment = urllib.parse.urlparse(dummyurl) user = None userhost = netloc.split('@') @@ -532,7 +532,7 @@ class SCM(object): netloc = self.host path = self.repository query = self.module - r['source'] = urlparse.urlunsplit([scheme, netloc, path, query, fragment]) + r['source'] = urllib.parse.urlunsplit([scheme, netloc, path, query, fragment]) else: # just use the same url r['source'] = self.url