Merge pull request jupyterhub#2408 from consideRatio/pr/f-strings

Use f-strings instead of the % pattern
mriedem · Sep 27, 2021 · f3783cd · f3783cd
2 parents 50d911d + 7ce8dd6
commit f3783cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -222,15 +222,15 @@ def parse_schema(d, md=[], depth=0, pre=""):
         depth += 1
         # Create markdown headers for each schema level
         for key, val in d["properties"].items():
-            md.append("(schema_%s)=" % (pre + key))
-            md.append("#" * (depth + 1) + " " + pre + key)
+            md.append(f"(schema_{pre}{key})=")
+            md.append("#" * (depth + 1) + f" {pre}{key}")
             md.append("")
             if "description" in val:
                 for ln in val["description"].split("\n"):
                     md.append(ln)
                 md.append("")
 
-            parse_schema(val, md, depth, pre + f"{key}.")
+            parse_schema(val, md, depth, f"{pre}{key}.")
         depth -= 1
     return md
 

diff --git a/jupyterhub/files/hub/jupyterhub_config.py b/jupyterhub/files/hub/jupyterhub_config.py
@@ -224,7 +224,7 @@ def camelCaseify(s):
         pass
     else:
         raise ValueError(
-            "Unrecognized value for matchNodePurpose: %r" % match_node_purpose
+            f"Unrecognized value for matchNodePurpose: {match_node_purpose}"
         )
 
 # Combine the common tolerations for user pods with singleuser tolerations
@@ -347,15 +347,15 @@ def camelCaseify(s):
 
     cull_timeout = get_config("cull.timeout")
     if cull_timeout:
-        cull_cmd.append("--timeout=%s" % cull_timeout)
+        cull_cmd.append(f"--timeout={cull_timeout}")
 
     cull_every = get_config("cull.every")
     if cull_every:
-        cull_cmd.append("--cull-every=%s" % cull_every)
+        cull_cmd.append(f"--cull-every={cull_every}")
 
     cull_concurrency = get_config("cull.concurrency")
     if cull_concurrency:
-        cull_cmd.append("--concurrency=%s" % cull_concurrency)
+        cull_cmd.append(f"--concurrency={cull_concurrency}")
 
     if get_config("cull.users"):
         cull_cmd.append("--cull-users")
@@ -366,7 +366,7 @@ def camelCaseify(s):
 
     cull_max_age = get_config("cull.maxAge")
     if cull_max_age:
-        cull_cmd.append("--max-age=%s" % cull_max_age)
+        cull_cmd.append(f"--max-age={cull_max_age}")
 
     c.JupyterHub.services.append(
         {
@@ -459,5 +459,5 @@ def camelCaseify(s):
 
 # execute hub.extraConfig entries
 for key, config_py in sorted(get_config("hub.extraConfig", {}).items()):
-    print("Loading extra config: %s" % key)
+    print(f"Loading extra config: {key}")
     exec(config_py)