sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-23 20:59:10 +03:00
Code Activity

python compat: remove string_types

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Douglas Bagnall
2020-07-04 13:47:44 +12:00
committed by Noel Power
parent 323073f4e0
commit 9cc65a552b
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/samba/__init__.py
View File

@ -29,7 +29,6 @@ import ldb
import samba.param
from samba import _glue
from samba._ldb import Ldb as _Ldb
from samba.compat import string_types
def source_tree_topdir():
@ -250,8 +249,8 @@ def substitute_var(text, values):
"""
for (name, value) in values.items():
assert isinstance(name, string_types), "%r is not a string" % name
assert isinstance(value, string_types), "Value %r for %s is not a string" % (value, name)
assert isinstance(name, str), "%r is not a string" % name
assert isinstance(value, str), "Value %r for %s is not a string" % (value, name)
text = text.replace("${%s}" % name, value)
return text