[#3287] address review

Author: andrei-pavel

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
 

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))