diff options
| author | Noel Power <noel.power@suse.com> | 2018-05-04 11:41:11 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-05-12 21:38:16 +0200 |
| commit | a0cd47fdf8819efb2c72e81cb132e2f1308bd395 (patch) | |
| tree | e75b787ba7a7ebb9ae727cc7738020deabeda751 /python | |
| parent | 9410cea310f6ac5089a28b90a93bd3b20ffa2d9b (diff) | |
| download | samba-a0cd47fdf8819efb2c72e81cb132e2f1308bd395.tar.gz samba-a0cd47fdf8819efb2c72e81cb132e2f1308bd395.tar.bz2 samba-a0cd47fdf8819efb2c72e81cb132e2f1308bd395.zip | |
python/samba/provision: Fix urllib.quote usage for py2/py3
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/provision/__init__.py | 4 | ||||
| -rw-r--r-- | python/samba/provision/backend.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 43ccb0f8766..a134311d2bd 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -26,6 +26,7 @@ __docformat__ = "restructuredText" +from samba.compat import urllib_quote from base64 import b64encode import errno import os @@ -37,7 +38,6 @@ import logging import time import uuid import socket -import urllib import string import tempfile import samba.dsdb @@ -2189,7 +2189,7 @@ def provision(logger, session_info, smbconf=None, if paths.sysvol and not os.path.exists(paths.sysvol): os.makedirs(paths.sysvol, 0o775) - ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="") + ldapi_url = "ldapi://%s" % urllib_quote(paths.s4_ldapi_path, safe="") schema = Schema(domainsid, invocationid=invocationid, schemadn=names.schemadn, base_schema=base_schema) diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py index 278e69f649d..af829873539 100644 --- a/python/samba/provision/backend.py +++ b/python/samba/provision/backend.py @@ -25,6 +25,7 @@ """Functions for setting up a Samba configuration (LDB and LDAP backends).""" +from samba.compat import urllib_quote from base64 import b64encode import errno import ldb @@ -183,7 +184,7 @@ class LDAPBackend(ProvisionBackend): if ldap_backend_forced_uri is not None: self.ldap_uri = ldap_backend_forced_uri else: - self.ldap_uri = "ldapi://%s" % urllib.quote( + self.ldap_uri = "ldapi://%s" % urllib_quote( os.path.join(self.ldapdir, "ldapi"), safe="") if not os.path.exists(self.ldapdir): |