PBCKP-588 fixes after review - remove f-strings

Author: v.shepard

testgres/connection.py

@@ -111,7 +111,7 @@ def execute(self, query, *args):
 
             return res
         except Exception as e:
-            print(f"Error executing query: {e}")
+            print("Error executing query: {}".format(e))
             return None
 
     def close(self):

testgres/node.py

@@ -1006,7 +1006,7 @@ def safe_psql(self, query=None, expect_error=False, **kwargs):
             else:
                 raise QueryException(err or b'', query)
         elif expect_error:
-            assert False, f"Exception was expected, but query finished successfully: `{query}` "
+            assert False, "Exception was expected, but query finished successfully: `{}` ".format(query)
 
         return out
 

testgres/operations/local_ops.py

@@ -84,7 +84,7 @@ def exec_command(self, cmd, wait_exit=False, verbose=False,
             if exit_status != 0 or found_error:
                 if exit_status == 0:
                     exit_status = 1
-                raise ExecUtilException(message=f'Utility exited with non-zero code. Error `{error}`',
+                raise ExecUtilException(message='Utility exited with non-zero code. Error `{}`'.format(error),
                                         command=cmd,
                                         exit_code=exit_status,
                                         out=result)
@@ -138,7 +138,7 @@ def pathsep(self):
         elif os_name == "nt":
             pathsep = ";"
         else:
-            raise Exception(f"Unsupported operating system: {os_name}")
+            raise Exception("Unsupported operating system: {}".format(os_name))
         return pathsep
 
     def mkdtemp(self, prefix=None):
@@ -242,7 +242,7 @@ def remove_file(self, filename):
     # Processes control
     def kill(self, pid, signal):
         # Kill the process
-        cmd = f"kill -{signal} {pid}"
+        cmd = "kill -{} {}".format(signal, pid)
         return self.exec_command(cmd)
 
     def get_pid(self):

testgres/operations/remote_ops.py

@@ -26,11 +26,11 @@ def __init__(self, ssh, pid):
         self.pid = pid
 
     def kill(self):
-        command = f"kill {self.pid}"
+        command = "kill {}".format(self.pid)
         self.ssh.exec_command(command)
 
     def cmdline(self):
-        command = f"ps -p {self.pid} -o cmd --no-headers"
+        command = "ps -p {} -o cmd --no-headers".format(self.pid)
         stdin, stdout, stderr = self.ssh.exec_command(command)
         cmdline = stdout.read().decode('utf-8').strip()
         return cmdline.split()
@@ -84,9 +84,9 @@ def _read_ssh_key(self):
                     key = paramiko.RSAKey.from_private_key_file(self.ssh_key)
                 return key
         except FileNotFoundError:
-            raise ExecUtilException(message=f"No such file or directory: '{self.ssh_key}'")
+            raise ExecUtilException(message="No such file or directory: '{}'".format(self.ssh_key))
         except Exception as e:
-            ExecUtilException(message=f"An error occurred while reading the ssh key: {e}")
+            ExecUtilException(message="An error occurred while reading the ssh key: {}".format(e))
 
     def exec_command(self, cmd: str, wait_exit=False, verbose=False, expect_error=False,
                      encoding=None, shell=True, text=False, input=None, stdout=None,
@@ -131,7 +131,7 @@ def exec_command(self, cmd: str, wait_exit=False, verbose=False, expect_error=Fa
         if error_found:
             if exit_status == 0:
                 exit_status = 1
-            raise ExecUtilException(message=f"Utility exited with non-zero code. Error: {error.decode(encoding or 'utf-8')}",
+            raise ExecUtilException(message="Utility exited with non-zero code. Error: {}".format(error.decode(encoding or 'utf-8')),
                                     command=cmd,
                                     exit_code=exit_status,
                                     out=result)
@@ -148,7 +148,7 @@ def environ(self, var_name: str) -> str:
         Args:
         - var_name (str): The name of the environment variable.
         """
-        cmd = f"echo ${var_name}"
+        cmd = "echo ${}".format(var_name)
         return self.exec_command(cmd, encoding='utf-8').strip()
 
     def find_executable(self, executable):
@@ -166,7 +166,7 @@ def find_executable(self, executable):
 
     def is_executable(self, file):
         # Check if the file is executable
-        is_exec = self.exec_command(f"test -x {file} && echo OK")
+        is_exec = self.exec_command("test -x {} && echo OK".format(file))
         return is_exec == b"OK\n"
 
     def set_env(self, var_name: str, var_val: str):
@@ -176,7 +176,7 @@ def set_env(self, var_name: str, var_val: str):
         - var_name (str): The name of the environment variable.
         - var_val (str): The value to be set for the environment variable.
         """
-        return self.exec_command(f"export {var_name}={var_val}")
+        return self.exec_command("export {}={}".format(var_name, var_val))
 
     # Get environment variables
     def get_user(self):
@@ -195,12 +195,12 @@ def makedirs(self, path, remove_existing=False):
         - remove_existing (bool): If True, the existing directory at the path will be removed.
         """
         if remove_existing:
-            cmd = f"rm -rf {path} && mkdir -p {path}"
+            cmd = "rm -rf {} && mkdir -p {}".format(path, path)
         else:
-            cmd = f"mkdir -p {path}"
+            cmd = "mkdir -p {}".format(path)
         exit_status, result, error = self.exec_command(cmd, verbose=True)
         if exit_status != 0:
-            raise Exception(f"Couldn't create dir {path} because of error {error}")
+            raise Exception("Couldn't create dir {} because of error {}".format(path, error))
         return result
 
     def rmdirs(self, path, verbose=False, ignore_errors=True):
@@ -211,7 +211,7 @@ def rmdirs(self, path, verbose=False, ignore_errors=True):
         - verbose (bool): If True, return exit status, result, and error.
         - ignore_errors (bool): If True, do not raise error if directory does not exist.
         """
-        cmd = f"rm -rf {path}"
+        cmd = "rm -rf {}".format(path)
         exit_status, result, error = self.exec_command(cmd, verbose=True)
         if verbose:
             return exit_status, result, error
@@ -224,11 +224,11 @@ def listdir(self, path):
         Args:
         path (str): The path to the directory.
         """
-        result = self.exec_command(f"ls {path}")
+        result = self.exec_command("ls {}".format(path))
         return result.splitlines()
 
     def path_exists(self, path):
-        result = self.exec_command(f"test -e {path}; echo $?", encoding='utf-8')
+        result = self.exec_command("test -e {}; echo $?".format(path), encoding='utf-8')
         return int(result.strip()) == 0
 
     @property
@@ -239,7 +239,7 @@ def pathsep(self):
         elif os_name == "nt":
             pathsep = ";"
         else:
-            raise Exception(f"Unsupported operating system: {os_name}")
+            raise Exception("Unsupported operating system: {}".format(os_name))
         return pathsep
 
     def mkdtemp(self, prefix=None):
@@ -249,7 +249,7 @@ def mkdtemp(self, prefix=None):
         - prefix (str): The prefix of the temporary directory name.
         """
         if prefix:
-            temp_dir = self.exec_command(f"mktemp -d {prefix}XXXXX", encoding='utf-8')
+            temp_dir = self.exec_command("mktemp -d {}XXXXX".format(prefix), encoding='utf-8')
         else:
             temp_dir = self.exec_command("mktemp -d", encoding='utf-8')
 
@@ -262,7 +262,7 @@ def mkdtemp(self, prefix=None):
 
     def mkstemp(self, prefix=None):
         if prefix:
-            temp_dir = self.exec_command(f"mktemp {prefix}XXXXX", encoding='utf-8')
+            temp_dir = self.exec_command("mktemp {}XXXXX".format(prefix), encoding='utf-8')
         else:
             temp_dir = self.exec_command("mktemp", encoding='utf-8')
 
@@ -277,8 +277,8 @@ def copytree(self, src, dst):
         if not os.path.isabs(dst):
             dst = os.path.join('~', dst)
         if self.isdir(dst):
-            raise FileExistsError(f"Directory {dst} already exists.")
-        return self.exec_command(f"cp -r {src} {dst}")
+            raise FileExistsError("Directory {} already exists.".format(dst))
+        return self.exec_command("cp -r {} {}".format(src, dst))
 
     # Work with files
     def write(self, filename, data, truncate=False, binary=False, read_and_write=False, encoding='utf-8'):
@@ -344,10 +344,10 @@ def touch(self, filename):
 
         This method behaves as the 'touch' command in Unix. It's equivalent to calling 'touch filename' in the shell.
         """
-        self.exec_command(f"touch {filename}")
+        self.exec_command("touch {}".format(filename))
 
     def read(self, filename, binary=False, encoding=None):
-        cmd = f"cat {filename}"
+        cmd = "cat {}".format(filename)
         result = self.exec_command(cmd, encoding=encoding)
 
         if not binary and result:
@@ -357,9 +357,9 @@ def read(self, filename, binary=False, encoding=None):
 
     def readlines(self, filename, num_lines=0, binary=False, encoding=None):
         if num_lines > 0:
-            cmd = f"tail -n {num_lines} {filename}"
+            cmd = "tail -n {} {}".format(num_lines, filename)
         else:
-            cmd = f"cat {filename}"
+            cmd = "cat {}".format(filename)
 
         result = self.exec_command(cmd, encoding=encoding)
 
@@ -371,31 +371,31 @@ def readlines(self, filename, num_lines=0, binary=False, encoding=None):
         return lines
 
     def isfile(self, remote_file):
-        stdout = self.exec_command(f"test -f {remote_file}; echo $?")
+        stdout = self.exec_command("test -f {}; echo $?".format(remote_file))
         result = int(stdout.strip())
         return result == 0
 
     def isdir(self, dirname):
-        cmd = f"if [ -d {dirname} ]; then echo True; else echo False; fi"
+        cmd = "if [ -d {} ]; then echo True; else echo False; fi".format(dirname)
         response = self.exec_command(cmd)
         return response.strip() == b"True"
 
     def remove_file(self, filename):
-        cmd = f"rm {filename}"
+        cmd = "rm {}".format(filename)
         return self.exec_command(cmd)
 
     # Processes control
     def kill(self, pid, signal):
         # Kill the process
-        cmd = f"kill -{signal} {pid}"
+        cmd = "kill -{} {}".format(signal, pid)
         return self.exec_command(cmd)
 
     def get_pid(self):
         # Get current process id
         return int(self.exec_command("echo $$", encoding='utf-8'))
 
     def get_process_children(self, pid):
-        command = f"pgrep -P {pid}"
+        command = "pgrep -P {}".format(pid)
         stdin, stdout, stderr = self.ssh.exec_command(command)
         children = stdout.readlines()
         return [PsUtilProcessProxy(self.ssh, int(child_pid.strip())) for child_pid in children]
@@ -437,4 +437,4 @@ def db_connect(self, dbname, user, password=None, host="127.0.0.1", port=5432, s
             return conn
         except Exception as e:
             self.tunnel.stop()
-            raise ExecUtilException("Could not create db tunnel.")
+            raise ExecUtilException("Could not create db tunnel. {}".format(e))

testgres/utils.py

@@ -72,7 +72,7 @@ def execute_utility(args, logfile=None, verbose=False):
                 lines = [u'\n'] + ['# ' + line for line in out.splitlines()] + [u'\n']
                 tconf.os_ops.write(filename=logfile, data=lines)
         except IOError:
-            raise ExecUtilException(f"Problem with writing to logfile `{logfile}` during run command `{args}`")
+            raise ExecUtilException("Problem with writing to logfile `{}` during run command `{}`".format(logfile, args))
     if verbose:
         return exit_status, out, error
     else:

tests/test_simple_remote.py

@@ -750,9 +750,8 @@ def test_pgbench(self):
 
             # run TPC-B benchmark
             out = node.pgbench(stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT,
-                                options=['-T3'])
-
+                               stderr=subprocess.STDOUT,
+                               options=['-T3'])
             self.assertTrue(b'tps = ' in out)
 
     def test_pg_config(self):