Adding upstream version 1.31.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>

test/features/steps/auto_vertical.py

@@ -41,7 +41,7 @@ def step_see_small_results(context):
 @then("we see large results in vertical format")
 def step_see_large_results(context):
     rows = ["{n:3}| {n}".format(n=str(n)) for n in range(1, 50)]
-    expected = "***************************[ 1. row ]" "***************************\r\n" + "{}\r\n".format("\r\n".join(rows) + "\r\n")
+    expected = "***************************[ 1. row ]***************************\r\n" + "{}\r\n".format("\r\n".join(rows) + "\r\n")
 
     wrappers.expect_pager(context, expected, timeout=10)
     wrappers.expect_exact(context, "1 row in set", timeout=2)

test/features/steps/connection.py

@@ -32,7 +32,7 @@ def status_contains(context, expression):
 
 @when("we create my.cnf file")
 def step_create_my_cnf_file(context):
-    my_cnf = "[client]\n" f"host = {HOST}\n" f"port = {PORT}\n" f"user = {USER}\n" f"password = {PASSWORD}\n"
+    my_cnf = f"[client]\nhost = {HOST}\nport = {PORT}\nuser = {USER}\npassword = {PASSWORD}\n"
     with open(MY_CNF_PATH, "w") as f:
         f.write(my_cnf)
 
@@ -40,7 +40,7 @@ def step_create_my_cnf_file(context):
 @when("we create mylogin.cnf file")
 def step_create_mylogin_cnf_file(context):
     os.environ.pop("MYSQL_TEST_LOGIN_FILE", None)
-    mylogin_cnf = f"[{TEST_LOGIN_PATH}]\n" f"host = {HOST}\n" f"port = {PORT}\n" f"user = {USER}\n" f"password = {PASSWORD}\n"
+    mylogin_cnf = f"[{TEST_LOGIN_PATH}]\nhost = {HOST}\nport = {PORT}\nuser = {USER}\npassword = {PASSWORD}\n"
     with open(MYLOGIN_CNF_PATH, "wb") as f:
         input_file = io.StringIO(mylogin_cnf)
         f.write(encrypt_mylogin_cnf(input_file).read())

test/features/steps/wrappers.py

@@ -81,9 +81,7 @@ def run_cli(context, run_args=None, exclude_args=None):
     try:
         cli_cmd = context.conf["cli_command"]
     except KeyError:
-        cli_cmd = ('{0!s} -c "' "import coverage ; " "coverage.process_startup(); " "import mycli.main; " "mycli.main.cli()" '"').format(
-            sys.executable
-        )
+        cli_cmd = ('{0!s} -c "import coverage ; coverage.process_startup(); import mycli.main; mycli.main.cli()"').format(sys.executable)
 
     cmd_parts = [cli_cmd] + rendered_args
     cmd = " ".join(cmd_parts)