ref: use more f-strings

Author: paulmueller

CHANGELOG

@@ -1,3 +1,5 @@
+0.17.2
+ - ref: use more f-strings
 0.17.1
  - fix: found culprit of regular segmentation faults (#14)
  - reg: invalid use PyQt6 namespace after migration from PyQt5

dcoraid/api/ckan_api.py

@@ -180,20 +180,19 @@ def handle_response(self, req, api_call):
             if rdata.startswith("Bad request"):
                 raise APIBadRequest(rdata)
             else:
-                raise ValueError(
-                    "Command did not succeed, output: '{}'".format(rdata))
+                raise ValueError(f"Command did not succeed, output: '{rdata}'")
 
         if not req.ok:
             error = rdata.get("error", {})
             e_type = error.get("__type", req.reason)
             etext = ""
             for key in error:
                 if not key.startswith("_"):
-                    etext += "{}: {}".format(key, error[key])
+                    etext += f"{key}: {error[key]}"
             if not etext and len(req.reason) < 100:
                 # Skip large html output, only use small error messages
                 etext = req.content.decode("utf-8")
-            msg = "{}: {} (for '{}')".format(e_type, etext, api_call)
+            msg = f"{e_type}: {etext} (for '{api_call}')"
             if req.reason == "NOT FOUND":
                 raise APINotFoundError(msg)
             elif req.reason == "CONFLICT":
@@ -211,8 +210,8 @@ def handle_response(self, req, api_call):
         elif not rdata["success"]:
             url_call = self.api_url + api_call
             raise ConnectionError(
-                "Could not run API call '{}'! ".format(url_call)
-                + "Reason: {} ({})".format(req.reason, rdata["error"]))
+                f"Could not run API call '{url_call}'! "
+                f"Reason: {req.reason} ({rdata['error']})")
         return rdata
 
     def copy(self):

dcoraid/dbmodel/db_api.py

@@ -123,7 +123,7 @@ def search_dataset(self, query="*:*", filter_queries=None, circles=None,
             filter_queries = []
         # https://docs.ckan.org/en/latest/user-guide.html#search-in-detail
         if circles:
-            solr_circles = ["organization:{}".format(ci) for ci in circles]
+            solr_circles = [f"organization:{ci}" for ci in circles]
             if len(circles) == 1:
                 solr_circle_query = solr_circles[0]
             else:
@@ -132,7 +132,7 @@ def search_dataset(self, query="*:*", filter_queries=None, circles=None,
             solr_circle_query = None
 
         if collections:
-            solr_collections = ["groups:{}".format(co) for co in collections]
+            solr_collections = [f"groups:{co}" for co in collections]
             if len(collections) == 1:
                 solr_collections_query = solr_collections[0]
             else:

dcoraid/download/job.py

@@ -221,9 +221,9 @@ def get_rate_string(self):
             rate_label = "-- kB/s"
         else:
             if rate > 1e6:
-                rate_label = "{:.1f} MB/s".format(rate / 1e6)
+                rate_label = f"{rate / 1e6:.1f} MB/s"
             else:
-                rate_label = "{:.0f} kB/s".format(rate / 1e3)
+                rate_label = f"{rate / 1e3:.0f} kB/s"
             if state != "transfer":
                 rate_label = "⌀ " + rate_label
         return rate_label
@@ -318,7 +318,7 @@ def set_state(self, state):
         The state is checked against :const:`JOB_STATES`
         """
         if state not in JOB_STATES:
-            raise ValueError("Unknown state: '{}'".format(state))
+            raise ValueError(f"Unknown state: '{state}'")
         if state == "error":
             logger.error("Entered error state")
             if self.traceback:
@@ -406,9 +406,9 @@ def task_download_resource(self):
                     self.end_time = time.perf_counter()
                     self.set_state("downloaded")
         else:
-            warnings.warn("Starting a download only possible when state is "
-                          + "'init' or 'wait-disk', but current state is "
-                          + "'{}'!".format(self.state))
+            warnings.warn(f"Starting a download only possible when state is "
+                          f"'init' or 'wait-disk', but current state is "
+                          f"'{self.state}'!")
 
     def task_verify_resource(self):
         """Perform ETag/SHA256 verification"""
@@ -479,6 +479,6 @@ def task_verify_resource(self):
                             self.set_state("done")
         elif self.state != "done":  # ignore state "done" [sic!]
             # Only issue this warning if the download is not already done.
-            warnings.warn("Resource verification is only possible when state "
-                          + "is 'downloaded', but current state is "
-                          + "'{}'!".format(self.state))
+            warnings.warn(f"Resource verification is only possible when state "
+                          f"is 'downloaded', but current state is "
+                          f"'{self.state}'!")

dcoraid/download/queue.py

@@ -139,7 +139,7 @@ def get_job(self, job_id):
             if job.job_id == job_id:
                 return job
         else:
-            raise KeyError("Job '{}' not found!".format(job_id))
+            raise KeyError(f"Job '{job_id}' not found!")
 
     def get_status(self):
         """Return the status of a DownloadQueue"""

dcoraid/gui/download/widget_download.py

@@ -198,7 +198,7 @@ def set_label_item(self, row, col, label):
 
         User has to make sure that row and column count are set
         """
-        label = "{}".format(label)
+        label = f"{label}"
         item = self.item(row, col)
         if item is None:
             item = QtWidgets.QTableWidgetItem(label)

dcoraid/gui/main.py

@@ -145,15 +145,16 @@ def on_action_about(self):
         dcor = "https://dcor.mpl.mpg.de"
         gh = "DCOR-dev/DCOR-Aid"
         rtd = "dc.readthedocs.io"
-        about_text = "This is the client for the <a href='{}'>".format(dcor) \
-            + "Deformability Cytometry Open Repository (DCOR)</a>.<br><br>" \
-            + "Author: Paul Müller<br>" \
-            + "GitHub: " \
-            + "<a href='https://github.com/{gh}'>{gh}</a><br>".format(gh=gh) \
-            + "Documentation: " \
-            + "<a href='https://{rtd}'>{rtd}</a><br>".format(rtd=rtd)
+        about_text = (
+            f"This is the client for the <a href='{dcor}'>"
+            f"Deformability Cytometry Open Repository (DCOR)</a>.<br><br>"
+            f"Author: Paul Müller<br>"
+            f"GitHub: "
+            f"<a href='https://github.com/{gh}'>{gh}</a><br>"
+            f"Documentation: "
+            f"<a href='https://{rtd}'>{rtd}</a><br>")
         QtWidgets.QMessageBox.about(self,
-                                    "DCOR-Aid {}".format(__version__),
+                                    f"DCOR-Aid {__version__}",
                                     about_text)
 
     @QtCore.pyqtSlot(bool)
@@ -193,10 +194,10 @@ def on_action_check_update_finished(self, mdict):
         msg.setTextFormat(QtCore.Qt.TextFormat.RichText)
         text = f"You can install DCOR-Aid {ver} "
         if dlb is not None:
-            text += 'from a <a href="{}">direct download</a>. '.format(dlb)
+            text += f'from a <a href="{dlb}">direct download</a>. '
         else:
             text += 'by running `pip install --upgrade dcoraid`. '
-        text += 'Visit the <a href="{}">official release page</a>!'.format(web)
+        text += f'Visit the <a href="{web}">official release page</a>!'
         msg.setText(text)
         msg.exec()
 
@@ -208,12 +209,12 @@ def on_action_software(self):
                 requests_toolbelt,
                 urllib3,
                 ]
-        sw_text = "DCOR-Aid {}\n\n".format(__version__)
-        sw_text += "Python {}\n\n".format(sys.version)
+        sw_text = f"DCOR-Aid {__version__}\n\n"
+        sw_text += f"Python {sys.version}\n\n"
         sw_text += "Modules:\n"
         for lib in libs:
-            sw_text += "- {} {}\n".format(lib.__name__, lib.__version__)
-        sw_text += "- PyQt6 {}\n".format(QtCore.QT_VERSION_STR)
+            sw_text += f"- {lib.__name__} {lib.__version__}\n"
+        sw_text += f"- PyQt6 {QtCore.QT_VERSION_STR}\n"
         sw_text += "\n Breeze icon theme by the KDE Community (LGPL)."
         sw_text += "\n Font-Awesome icons by Fort Awesome (CC BY 4.0)."
         if hasattr(sys, 'frozen'):
@@ -263,8 +264,7 @@ def excepthook(etype, value, trace):
         prints the standard Python header: ``Traceback (most recent
         call last)``.
     """
-    vinfo = "Unhandled exception in DCOR-Aid version {}:\n".format(
-        __version__)
+    vinfo = f"Unhandled exception in DCOR-Aid version {__version__}:\n"
     tmp = tb.format_exception(etype, value, trace)
     exception = "".join([vinfo] + tmp)
 

dcoraid/gui/status_widget.py

@@ -148,8 +148,8 @@ def run(self):
                 name = user_data["name"]
                 if not fullname:
                     fullname = name
-                text = "{}".format(fullname)
-                tip = "user '{}'".format(name)
+                text = f"{fullname}"
+                tip = f"user '{name}'"
                 icon = "user-lock"
         self.logger.info(text)
         self.signal.state_signal.emit(text, tip, icon, api.server)

dcoraid/gui/updater.py

@@ -37,12 +37,12 @@ def check_for_update(version, ghrepo):
 
 def check_release(ghrepo="user/repo", version=None, timeout=20):
     """Check GitHub repository for latest release"""
-    url = "https://api.github.com/repos/{}/releases/latest".format(ghrepo)
+    url = f"https://api.github.com/repos/{ghrepo}/releases/latest"
     if "GITHUB_TOKEN" in os.environ:
         hdr = {'Authorization': os.environ["GITHUB_TOKEN"]}
     else:
         hdr = {}
-    web = "https://github.com/{}/releases".format(ghrepo)
+    web = f"https://github.com/{ghrepo}/releases"
     errors = None  # error messages (str)
     update = False  # whether an update is available
     binary = None  # download link to binary file

dcoraid/gui/upload/circle_mgr.py

@@ -41,7 +41,7 @@ def ask_for_new_circle(parent_widget):
         + "'{}').".format(ud["name"])
         + "\n\nTo proceed with Circle creation, please choose a name:",
         QtWidgets.QLineEdit.EchoMode.Normal,
-        "{}'s Circle".format(name))
+        f"{name}'s Circle")
     if ok_pressed and text != '':
         cname = "user-circle-{}".format(ud["name"])
         cdict = api.post("organization_create",