1
0
mirror of https://github.com/samba-team/samba.git synced 2025-07-28 11:42:03 +03:00

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>
This commit is contained in:
Noel Power
2018-09-19 10:52:52 +02:00
committed by Andrew Bartlett
parent d28b4fa361
commit f71675dcbe

View File

@ -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)