[allura] branch dw/8519 updated: fixup! [#8519] ran 'pyupgrade --py38-plus --keep-mock ./**/*.py'

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dill0wn pushed a commit to branch dw/8519
in repository https://gitbox.apache.org/repos/asf/allura.git


The following commit(s) were added to refs/heads/dw/8519 by this push:
     new da2d5477c fixup! [#8519] ran 'pyupgrade --py38-plus --keep-mock ./**/*.py'
da2d5477c is described below

commit da2d5477c6bc12c70b19954e6b1540041bef5c83
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Mon Sep 18 10:12:07 2023 -0400

    fixup! [#8519] ran 'pyupgrade --py38-plus --keep-mock ./**/*.py'
---
 scripts/ApacheAccessHandler.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/ApacheAccessHandler.py b/scripts/ApacheAccessHandler.py
index 872a5be25..63ed8431f 100644
--- a/scripts/ApacheAccessHandler.py
+++ b/scripts/ApacheAccessHandler.py
@@ -51,7 +51,7 @@ def load_requests_lib(req):
         try:
             exec(compile(open(activate_this, "rb").read(), activate_this, 'exec'), {'__file__': activate_this})
         except Exception as e:
-            log(req, f"Couldn't activate venv via {activate_this}: {repr(e)}")
+            log(req, "Couldn't activate venv via {}: {}".format(activate_this, repr(e)))
     global requests
     import requests as requests_lib
     requests = requests_lib
@@ -66,7 +66,7 @@ def mangle(path):
     if len(parts) < 4:
         return None
     scm, nbhd, proj, rest = parts[0], parts[1], parts[2], parts[3:]
-    parts = [f'/SCM/{proj}.{nbhd}'] + rest
+    parts = ['/SCM/{}.{}'.format(proj, nbhd)] + rest
     return '/'.join(parts)
 
 
@@ -193,7 +193,7 @@ def check_permissions(req):
     permission = get_permission_name(req_path, req_query, req.method)
     authorized = cred.get(permission, False)
 
-    log(req, f"{r.url} -> {cred} -> {permission} -> authorized:{authorized}")
+    log(req, "{} -> {} -> {} -> authorized:{}".format(r.url, cred, permission, authorized))
     return authorized