fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 18:20:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clients/tests: support string arguments to Util.replace_text()

Browse source 
(cherry picked from commit 48225add3a)
This commit is contained in:
Thomas Haller 2019-12-13 10:00:38 +01:00
parent 03102696a8
commit e1d1e9150c
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clients/tests/test-client.py
View file

@ -278,6 +278,9 @@ class Util:
def replace_text(text, replace_arr):
if not replace_arr:
return text
needs_encode = Util.python_has_version(3) and Util.is_string(text)
if needs_encode:
text = text.encode('utf-8')
text = [text]
for replace in replace_arr:
try:
@ -301,7 +304,11 @@ class Util:
text2.append( (v_replace,) )
text2.append(t3)
text = text2
return b''.join([(t[0] if isinstance(t, tuple) else t) for t in text])
bb = b''.join([(t[0] if isinstance(t, tuple) else t) for t in text])
if needs_encode:
bb = bb.decode('utf-8')
return bb
@staticmethod
def debug_dbus_interface():