Fstrs everywhere (#292)

Author: Juliya Smith

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
       rev: v2.7.1
       hooks:
         - id: pyupgrade
-          args: ["--py3-plus"]
+          args: ["--py36-plus"]
     - repo: https://github.com/asottile/reorder_python_imports
       rev: v2.3.0
       hooks:

docs/conf.py

@@ -23,9 +23,9 @@
 author = "Code42 Software"
 
 # The short X.Y version
-version = "code42cli v{}".format(meta.__version__)
+version = f"code42cli v{meta.__version__}"
 # The full version, including alpha/beta/rc tags
-release = "code42cli v{}".format(meta.__version__)
+release = f"code42cli v{meta.__version__}"
 
 
 # -- General configuration ---------------------------------------------------

src/code42cli/bulk.py

@@ -23,9 +23,7 @@ def write_template_file(path, columns=None, flat_item=None):
             new_file.write(",".join(columns))
         else:
             new_file.write(
-                "# This template takes a single {} to be processed on each row.".format(
-                    flat_item or "item"
-                )
+                f"# This template takes a single {flat_item or 'item'} to be processed on each row."
             )
 
 
@@ -58,7 +56,7 @@ def generate_template_cmd_factory(group_name, commands_dict, help_message=None):
     def generate_template(cmd, path):
         columns = commands_dict[cmd]
         if not path:
-            filename = "{}_bulk_{}.csv".format(group_name, cmd.replace("-", "_"))
+            filename = f"{group_name}_bulk_{cmd.replace('-', '_')}.csv"
             path = os.path.join(os.getcwd(), filename)
         if isinstance(columns, str):
             write_template_file(path, columns=None, flat_item=columns)

src/code42cli/click_ext/groups.py

@@ -102,8 +102,9 @@ def _suggest_cmd(usage_err):
                 )
                 if not suggested_commands:
                     raise usage_err
-                usage_err.message = "No such command '{}'. Did you mean {}?".format(
-                    bad_arg, " or ".join(suggested_commands)
+                usage_err.message = (
+                    f"No such command '{bad_arg}'. "
+                    f"Did you mean {' or '.join(suggested_commands)}?"
                 )
         raise usage_err
 

src/code42cli/click_ext/options.py

@@ -18,7 +18,7 @@ def handle_parse_result(self, ctx, opts, args):
             if ctx.obj is not None:
                 found_incompatible = ", ".join(
                     [
-                        "--{}".format(opt.replace("_", "-"))
+                        f"--{opt.replace('_', '-')}"
                         for opt in opts
                         if opt in incompatible_opts
                     ]
@@ -27,9 +27,7 @@ def handle_parse_result(self, ctx, opts, args):
                     name = self.name.replace("_", "-")
                     raise click.BadOptionUsage(
                         option_name=self.name,
-                        message="--{} can't be used with: {}".format(
-                            name, found_incompatible
-                        ),
+                        message=f"--{name} can't be used with: {found_incompatible}",
                     )
             return super().handle_parse_result(ctx, opts, args)
 

src/code42cli/click_ext/types.py

@@ -115,9 +115,7 @@ def _get_dt_from_magic_time_pair(num, period):
         elif period == "m":
             delta = timedelta(minutes=num)
         else:
-            raise BadParameter(
-                "Couldn't parse magic time string: {}{}".format(num, period)
-            )
+            raise BadParameter(f"Couldn't parse magic time string: {num}{period}")
         return datetime.utcnow() - delta
 
     @staticmethod
@@ -127,11 +125,11 @@ def _get_dt_from_date_time_pair(date, time):
             time = "{}:{}:{}".format(*time.split(":") + ["00", "00"])
         else:
             time = "00:00:00"
-        date_string = "{} {}".format(date, time)
+        date_string = f"{date} {time}"
         try:
             dt = datetime.strptime(date_string, date_format)
         except ValueError:
-            raise BadParameter("Unable to parse date string: {}.".format(date_string))
+            raise BadParameter(f"Unable to parse date string: {date_string}.")
         else:
             return dt
 

src/code42cli/cmds/alert_rules.py

@@ -73,7 +73,7 @@ def remove_user(state, rule_id, username):
         _remove_user(state.sdk, rule_id, username)
     except Py42BadRequestError:
         raise Code42CLIError(
-            "User {} is not currently assigned to rule-id {}.".format(username, rule_id)
+            f"User {username} is not currently assigned to rule-id {rule_id}."
         )
 
 
@@ -118,9 +118,8 @@ def bulk(state):
 
 
 @bulk.command(
-    help="Bulk add users to alert rules from a CSV file. CSV file format: {}".format(
-        ",".join(ALERT_RULES_CSV_HEADERS)
-    )
+    help=f"Bulk add users to alert rules from a CSV file. "
+    f"CSV file format: {','.join(ALERT_RULES_CSV_HEADERS)}"
 )
 @read_csv_arg(headers=ALERT_RULES_CSV_HEADERS)
 @sdk_options()
@@ -136,9 +135,8 @@ def handle_row(rule_id, username):
 
 
 @bulk.command(
-    help="Bulk remove users from alert rules using a CSV file. CSV file format: {}".format(
-        ",".join(ALERT_RULES_CSV_HEADERS)
-    )
+    help="Bulk remove users from alert rules using a CSV file. "
+    "CSV file format: {','.join(ALERT_RULES_CSV_HEADERS)}"
 )
 @read_csv_arg(headers=ALERT_RULES_CSV_HEADERS)
 @sdk_options()
@@ -182,8 +180,8 @@ def _get_rule_metadata(sdk, rule_id):
 
 def _handle_rules_results(rules, rule_id=None):
     if not rules:
-        id_msg = "with RuleId {} ".format(rule_id) if rule_id else ""
-        msg = "No alert rules {}found.".format(id_msg)
+        id_msg = f"with RuleId {rule_id} " if rule_id else ""
+        msg = f"No alert rules {id_msg}found."
         raise Code42CLIError(msg)
     return rules
 
@@ -198,5 +196,5 @@ def _get_rule_type_func(sdk, rule_type):
     else:
         raise Code42CLIError(
             "Received an unknown rule type from server. You might need to update "
-            "to a newer version of {}".format(PRODUCT_NAME)
+            f"to a newer version of {PRODUCT_NAME}"
         )

src/code42cli/cmds/cases.py

@@ -193,7 +193,7 @@ def show(state, case_number, format, include_file_events):
             events = _get_file_events(state.sdk, case_number)
             _display_file_events(events)
     except Py42NotFoundError:
-        raise Code42CLIError("Invalid case-number {}.".format(case_number))
+        raise Code42CLIError(f"Invalid case-number {case_number}.")
 
 
 @cases.command()
@@ -207,7 +207,7 @@ def show(state, case_number, format, include_file_events):
 def export(state, case_number, path):
     """Download a case detail summary as a PDF file at the given path with name <case_number>_case_summary.pdf."""
     response = state.sdk.cases.export_summary(case_number)
-    file = os.path.join(path, "{}_case_summary.pdf".format(case_number))
+    file = os.path.join(path, f"{case_number}_case_summary.pdf")
     with open(file, "wb") as f:
         f.write(response.content)
 

src/code42cli/cmds/departing_employee.py

@@ -28,7 +28,7 @@ def _get_filter_choices():
 DATE_FORMAT = "%Y-%m-%d"
 filter_option = click.option(
     "--filter",
-    help="Departing employee filter options. Defaults to {}.".format(ALL_FILTER),
+    help=f"Departing employee filter options. Defaults to {ALL_FILTER}.",
     type=click.Choice(_get_filter_choices()),
     default=ALL_FILTER,
     callback=lambda ctx, param, arg: handle_filter_choice(arg),
@@ -96,7 +96,7 @@ def bulk(state):
 @bulk.command(
     name="add",
     help="Bulk add users to the Departing Employees detection list using a CSV file with "
-    "format: {}.".format(",".join(DEPARTING_EMPLOYEE_CSV_HEADERS)),
+    f"format: {','.join(DEPARTING_EMPLOYEE_CSV_HEADERS)}.",
 )
 @read_csv_arg(headers=DEPARTING_EMPLOYEE_CSV_HEADERS)
 @sdk_options()

src/code42cli/cmds/devices.py

@@ -83,9 +83,7 @@ def _deactivate_device(sdk, device_guid, change_device_name, purge_date):
     try:
         device = _change_device_activation(sdk, device_guid, "deactivate")
     except exceptions.Py42BadRequestError:
-        raise Code42CLIError(
-            "The device with GUID '{}' is in legal hold.".format(device_guid)
-        )
+        raise Code42CLIError(f"The device with GUID '{device_guid}' is in legal hold.")
     if purge_date:
         _update_cold_storage_purge_date(sdk, device_guid, purge_date)
     if change_device_name and not device.data["name"].startswith("deactivated_"):
@@ -113,12 +111,10 @@ def _change_device_activation(sdk, device_guid, cmd_str):
             sdk.devices.deactivate(device_id)
         return device
     except exceptions.Py42NotFoundError:
-        raise Code42CLIError(
-            "The device with GUID '{}' was not found.".format(device_guid)
-        )
+        raise Code42CLIError(f"The device with GUID '{device_guid}' was not found.")
     except exceptions.Py42ForbiddenError:
         raise Code42CLIError(
-            "Unable to {} the device with GUID '{}'.".format(cmd_str, device_guid)
+            f"Unable to {cmd_str} the device with GUID '{device_guid}'."
         )
 
 
@@ -509,14 +505,12 @@ def _add_backup_set_settings_to_dataframe(sdk, devices_dataframe):
     def handle_row(guid):
         try:
             current_device_settings = sdk.devices.get_settings(guid)
-        except Exception as e:
+        except Exception as err:
             return DataFrame.from_records(
                 [
                     {
                         "guid": guid,
-                        "ERROR": "Unable to retrieve device settings for {}: {}".format(
-                            guid, e
-                        ),
+                        "ERROR": f"Unable to retrieve device settings for {guid}: {err}",
                     }
                 ]
             )
@@ -591,8 +585,8 @@ def handle_row(**row):
                 sdk, row["guid"], row["change_device_name"], row["purge_date"]
             )
             row["deactivated"] = "True"
-        except Exception as e:
-            row["deactivated"] = "False: {}".format(e)
+        except Exception as err:
+            row["deactivated"] = f"False: {err}"
         return row
 
     result_rows = run_bulk_process(
@@ -615,8 +609,8 @@ def handle_row(**row):
         try:
             _reactivate_device(sdk, row["guid"])
             row["reactivated"] = "True"
-        except Exception as e:
-            row["reactivated"] = "False: {}".format(e)
+        except Exception as err:
+            row["reactivated"] = f"False: {err}"
         return row
 
     result_rows = run_bulk_process(

src/code42cli/cmds/high_risk_employee.py

@@ -30,7 +30,7 @@ def _get_filter_choices():
 
 filter_option = click.option(
     "--filter",
-    help="High risk employee filter options. Defaults to {}.".format(ALL_FILTER),
+    help=f"High risk employee filter options. Defaults to {ALL_FILTER}.",
     type=click.Choice(_get_filter_choices()),
     default=ALL_FILTER,
     callback=lambda ctx, param, arg: handle_filter_choice(arg),
@@ -126,7 +126,7 @@ def bulk(state):
 @bulk.command(
     name="add",
     help="Bulk add users to the high risk employees detection list using a CSV file with "
-    "format: {}.".format(",".join(HIGH_RISK_EMPLOYEE_CSV_HEADERS)),
+    f"format: {','.join(HIGH_RISK_EMPLOYEE_CSV_HEADERS)}.",
 )
 @read_csv_arg(headers=HIGH_RISK_EMPLOYEE_CSV_HEADERS)
 @sdk_options()
@@ -165,9 +165,8 @@ def handle_row(username):
 
 @bulk.command(
     name="add-risk-tags",
-    help="Adds risk tags to users in bulk using a CSV file with format: {}.".format(
-        ",".join(RISK_TAG_CSV_HEADERS)
-    ),
+    help=f"Adds risk tags to users in bulk using a CSV file with format: "
+    f"{','.join(RISK_TAG_CSV_HEADERS)}.",
 )
 @read_csv_arg(headers=RISK_TAG_CSV_HEADERS)
 @sdk_options()
@@ -184,9 +183,8 @@ def handle_row(username, tag):
 
 @bulk.command(
     name="remove-risk-tags",
-    help="Removes risk tags from users in bulk using a CSV file with format: {}.".format(
-        ",".join(RISK_TAG_CSV_HEADERS)
-    ),
+    help=f"Removes risk tags from users in bulk using a CSV file with format: "
+    f"{','.join(RISK_TAG_CSV_HEADERS)}.",
 )
 @read_csv_arg(headers=RISK_TAG_CSV_HEADERS)
 @sdk_options()

src/code42cli/cmds/legal_hold.py

@@ -190,9 +190,8 @@ def bulk(state):
 
 @bulk.command(
     name="add",
-    help="Bulk add custodians to legal hold matters using a CSV file. CSV file format: {}".format(
-        ",".join(LEGAL_HOLD_CSV_HEADERS)
-    ),
+    help=f"Bulk add custodians to legal hold matters using a CSV file. "
+    f"CSV file format: {','.join(LEGAL_HOLD_CSV_HEADERS)}",
 )
 @read_csv_arg(headers=LEGAL_HOLD_CSV_HEADERS)
 @sdk_options()
@@ -206,9 +205,8 @@ def handle_row(matter_id, username):
 
 
 @bulk.command(
-    help="Bulk release custodians from legal hold matters using a CSV file. CSV file format: {}".format(
-        ",".join(LEGAL_HOLD_CSV_HEADERS)
-    )
+    help=f"Bulk release custodians from legal hold matters using a CSV file. "
+    f"CSV file format: {','.join(LEGAL_HOLD_CSV_HEADERS)}"
 )
 @read_csv_arg(headers=LEGAL_HOLD_CSV_HEADERS)
 @sdk_options()
@@ -287,10 +285,10 @@ def _get_all_events(sdk, legal_hold_uid, begin_date, end_date):
 
 def _print_matter_members(username_list, member_type="active"):
     if username_list:
-        echo("\n{} matter members:\n".format(member_type.capitalize()))
+        echo(f"\n{member_type.capitalize()} matter members:\n")
         format_string_list_to_columns(username_list)
     else:
-        echo("No {} matter members.\n".format(member_type))
+        echo(f"No {member_type} matter members.\n")
 
 
 @lru_cache(maxsize=None)