From 3a128fbd8573a41268c5632c54d5dca8b6beaee8 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Wed, 13 Sep 2023 17:30:09 +0100
Subject: [PATCH] Run `pyupgrade` on the files changed on the merge forward

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 pkg/tests/integration/test_version.py |  3 +--
 salt/netapi/rest_cherrypy/app.py      | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkg/tests/integration/test_version.py b/pkg/tests/integration/test_version.py
index 2c3c539ca40..c0b3d8e2d28 100644
--- a/pkg/tests/integration/test_version.py
+++ b/pkg/tests/integration/test_version.py
@@ -31,8 +31,7 @@ def test_salt_versions_report_master(install_salt):
     ret.stdout.matcher.fnmatch_lines(["*Salt Version:*"])
     py_version = subprocess.run(
         [str(python_bin), "--version"],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+        capture_output=True,
     ).stdout
     py_version = py_version.decode().strip().replace(" ", ": ")
     ret.stdout.matcher.fnmatch_lines([f"*{py_version}*"])
diff --git a/salt/netapi/rest_cherrypy/app.py b/salt/netapi/rest_cherrypy/app.py
index e65bca8f2d9..5b84e4aa19e 100644
--- a/salt/netapi/rest_cherrypy/app.py
+++ b/salt/netapi/rest_cherrypy/app.py
@@ -898,7 +898,7 @@ def hypermedia_handler(*args, **kwargs):
 
         ret = {
             "status": cherrypy.response.status,
-            "return": "{}".format(traceback.format_exc())
+            "return": f"{traceback.format_exc()}"
             if cherrypy.config["debug"]
             else "An unexpected error occurred",
         }
@@ -1944,7 +1944,7 @@ class Logout(LowDataAdapter):
 
     _cp_config = dict(
         LowDataAdapter._cp_config,
-        **{"tools.salt_auth.on": True, "tools.lowdata_fmt.on": False}
+        **{"tools.salt_auth.on": True, "tools.lowdata_fmt.on": False},
     )
 
     def POST(self):  # pylint: disable=arguments-differ
@@ -2187,7 +2187,7 @@ class Events:
             "tools.salt_auth.on": False,
             "tools.hypermedia_in.on": False,
             "tools.hypermedia_out.on": False,
-        }
+        },
     )
 
     def __init__(self):
@@ -2392,7 +2392,7 @@ class Events:
 
                     data = next(stream)
                     yield "tag: {}\n".format(data.get("tag", ""))
-                    yield "data: {}\n\n".format(salt.utils.json.dumps(data))
+                    yield f"data: {salt.utils.json.dumps(data)}\n\n"
 
         return listen()
 
@@ -2422,7 +2422,7 @@ class WebsocketEndpoint:
             "tools.hypermedia_out.on": False,
             "tools.websocket.on": True,
             "tools.websocket.handler_cls": websockets.SynchronizingWebsocket,
-        }
+        },
     )
 
     def __init__(self):
@@ -2576,7 +2576,7 @@ class WebsocketEndpoint:
                                 SaltInfo.process(data, salt_token, self.opts)
                             else:
                                 handler.send(
-                                    "data: {}\n\n".format(salt.utils.json.dumps(data)),
+                                    f"data: {salt.utils.json.dumps(data)}\n\n",
                                     False,
                                 )
                         except UnicodeDecodeError:
@@ -2648,7 +2648,7 @@ class Webhook:
             "tools.lowdata_fmt.on": True,
             # Auth can be overridden in __init__().
             "tools.salt_auth.on": True,
-        }
+        },
     )
 
     def __init__(self):