diff options
| author | Wen Liang <liangwen12year@gmail.com> | 2023-08-23 14:25:32 -0400 |
|---|---|---|
| committer | Wen Liang <liangwen12year@gmail.com> | 2023-09-05 07:53:51 -0400 |
| commit | fa53b9721461dafd29639849c3b5d5498ce3668b (patch) | |
| tree | 5ab4d8736fc6ae062efc0e01a06d97169f8bb9b0 | |
| parent | 3821df2188b1c094db7440091a182771c05753c9 (diff) | |
test-client: fix python2 f-string and format compatibility issuewl/python2_f_string_fix
f-string is not supported in python2, and the autotool build complains
about it as follows:
```
LIBTOOL="/bin/sh ./libtool" "../src/tests/client/test-client.sh" "." ".." "python2" -- TestNmCloudSetup
File "/builds/NetworkManager/NetworkManager/src/tests/client/test-client.py", line 722
return f"{major}.{minor}.{micro}"
^
SyntaxError: invalid syntax
test-client.py failed!!
make[3]: *** [check-local-tests-client] Error 1
File "/builds/NetworkManager/NetworkManager/src/tests/client/test-client.py", line 722
return f"{major}.{minor}.{micro}"
^
SyntaxError: invalid syntax
test-client.py failed!!
```
Also, python2 complains about extra comma during argument unpacking.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1718
| -rwxr-xr-x | src/tests/client/test-client.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tests/client/test-client.py b/src/tests/client/test-client.py index baa229cfc5..ca9ade0bd7 100755 --- a/src/tests/client/test-client.py +++ b/src/tests/client/test-client.py @@ -719,7 +719,7 @@ class Util: micro = ver & 0xFF minor = (ver >> 8) & 0xFF major = ver >> 16 - return f"{major}.{minor}.{micro}" + return "%s.%s.%s" % (major, minor, micro) ############################################################################### @@ -2699,7 +2699,7 @@ def main(): sys.executable, __file__, "--started-with-dbus-session", - *sys.argv[1:], + *sys.argv[1:] ) except OSError as e: if e.errno != errno.ENOENT: |