[#3287] address review

diff --git a/doc/sphinx/api2doc.py b/doc/sphinx/api2doc.py
index 7787ab310eb1aa6c3734edeb1e1fab539d688e64..cc78e21bf2d2884c359d758f94a53c16b3ef8bd2 100755 (executable)
--- a/doc/sphinx/api2doc.py
+++ b/doc/sphinx/api2doc.py
@@ -42,7 +42,7 @@ def read_input_files(files):
                 print(f'\nError while processing {f}: {e}\n\n')
                 raise
             if name != descr['name']:
-                raise ValueError("Expected name == descr['name']. Name is {name} and descr['name'] is {descr['name']}.")
+                raise ValueError(f"Expected name == descr['name']. Name is {name}, descr['name'] is {descr['name']}.")
 
         apis[name] = descr
 

diff --git a/src/bin/shell/tests/shell_unittest.py.in b/src/bin/shell/tests/shell_unittest.py.in
index f4296460d2a6525a1726bb6d03cc5629b2435f89..e707d79a2fa0ae681341cf6627ca679018123026 100644 (file)
--- a/src/bin/shell/tests/shell_unittest.py.in
+++ b/src/bin/shell/tests/shell_unittest.py.in
@@ -162,12 +162,8 @@ class CARequestUnitTest(unittest.TestCase):
         """
         This test check if the basic HTTP authentication uses UTF-8 encoding.
         """
-        if sys.version_info[0] == 3:
-            user = 'libert\xe9'
-            password = '\xe9galit\xe9'
-        else:
-            user = 'libert\xe9'
-            password = '\xe9galit\xe9'
+        user = 'libert\xe9'
+        password = '\xe9galit\xe9'
         buser = user.encode('utf-8')
         bpassword = password.encode('utf-8')
         secret = b':'.join((buser, bpassword))