From: Noel Power <noel.power@suse.com>
Date: Wed, 19 Sep 2018 08:52:52 +0000 (+0200)
Subject: python/samba: PY3 add compat function urllib_join to replace urllib.urljoin
X-Git-Tag: tdb-1.3.17~1490
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f71675dcbee6cef5b1c6972d1281feb37e8e70b0;p=thirdparty%2Fsamba.git

python/samba: PY3 add compat function urllib_join to replace urllib.urljoin

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/compat.py b/python/samba/compat.py
index 54f5bce3aa5..0c1869ad3b5 100644
--- a/python/samba/compat.py
+++ b/python/samba/compat.py
@@ -70,6 +70,7 @@ if PY3:
         return (x > y) - (x < y)
     # compat functions
     from urllib.parse import quote as urllib_quote
+    from urllib.parse import urljoin as urllib_join
     from urllib.request import urlopen as urllib_urlopen
     from functools import cmp_to_key as cmp_to_key_fn
 
@@ -146,6 +147,7 @@ else:
     # compat functions
     from urllib import quote as urllib_quote
     from urllib import urlopen as urllib_urlopen
+    from urlparse import urljoin as urllib_join
 
     # compat types
     integer_types = (int, long)