Modernize syntax with pyupgrade

gitlabform/configuration/core.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 import os
 import textwrap
 from abc import ABC
@@ -57,7 +59,7 @@ def __init__(self, config_path=None, config_string=None):
                 # we are NOT checking for the existence of non-empty 'projects_and_groups' key here
                 # as it would break using GitLabForm as a library
 
-        except (FileNotFoundError, IOError):
+        except (FileNotFoundError, OSError):
             raise ConfigFileNotFoundException(config_path)
 
         except Exception as e:
@@ -110,7 +112,7 @@ def _parse_yaml(source: str, config_string: bool):
 
         return yaml_data
 
-    def get(self, path, default=None):
+    def get(self, path, default=None) -> Any:
         """
         :param path: "path" to given element in YAML file, for example for:
 
@@ -173,7 +175,9 @@ def is_skipped(self, an_array: list, item: str) -> bool:
         pass
 
     @staticmethod
-    def validate_break_inheritance_flag(config, section_name, parent_key=""):
+    def validate_break_inheritance_flag(
+        config: dict, section_name: str, parent_key: str = ""
+    ):
         for key, value in config.items():
             if "inherit" == key:
                 parent_key_description = (

gitlabform/core.py

@@ -42,7 +42,7 @@ class Formatter(
     pass
 
 
-class GitLabForm(object):
+class GitLabForm:
     def __init__(self, include_archived_projects=True, target=None, config_string=None):
 
         if target and config_string:

gitlabform/filter.py

@@ -5,7 +5,7 @@
 from gitlabform import EXIT_INVALID_INPUT, Groups, Projects
 
 
-class NonEmptyConfigsProvider(object):
+class NonEmptyConfigsProvider:
     """
     To speed up the processing of possibly long groups and projects lists we want to quickly remove
     the ones that have an empty effective config.

gitlabform/processors/project/files_processor.py

@@ -273,7 +273,7 @@ def get_commit_message_for_file_change(operation, file, configuration: dict):
         skip_build = configuration.get("files|" + file + "|skip_ci")
         skip_build_str = " [skip ci]" if skip_build else ""
 
-        return "%s%s" % (commit_message, skip_build_str)
+        return f"{commit_message}{skip_build_str}"
 
     @staticmethod
     def get_group(project_and_group):

gitlabform/processors/util/branch_protector.py

@@ -6,7 +6,7 @@
 from gitlabform.gitlab.core import NotFoundException
 
 
-class BranchProtector(object):
+class BranchProtector:
     new_api_keys = [
         "push_access_level",
         "merge_access_level",

gitlabform/processors/util/difference_logger.py

@@ -11,7 +11,7 @@ def hide(text: str):
     return f"<secret {hashlib.sha256(text.encode('utf-8')).hexdigest()[:8]}>"
 
 
-class DifferenceLogger(object):
+class DifferenceLogger:
     @staticmethod
     def log_diff(
         subject,

gitlabform/ui.py

@@ -215,7 +215,7 @@ def info_project_count(prefix, i: int, n: int, *rest: Token, **kwargs: Any) -> N
 
 def info_count(color, prefix, i: int, n: int, *rest: Token, **kwargs: Any) -> None:
     num_digits = len(str(n))
-    counter_format = "(%{}d/%d)".format(num_digits)
+    counter_format = f"(%{num_digits}d/%d)"
     counter_str = counter_format % (i, n)
     info(color, prefix, reset, counter_str, reset, *rest, **kwargs)
 

tests/acceptance/__init__.py

@@ -29,7 +29,7 @@
             print(f"Trying to read {file_path} ...")
             if os.path.isfile(file_path):
                 try:
-                    with open(file_path, "r") as file:
+                    with open(file_path) as file:
                         os.environ[env_var] = file.read().strip()
                         print(f"{env_var} set!")
                         break

tests/acceptance/premium/test_merge_request_approvers.py

@@ -314,11 +314,11 @@ def test__more_than_one_user_and_more_than_one_group(
         for rule in rules:
             if rule["name"] == APPROVAL_RULE_NAME:
                 assert len(rule["users"]) == 2
-                usernames_in_rule = set([user["username"] for user in rule["users"]])
+                usernames_in_rule = {user["username"] for user in rule["users"]}
                 assert usernames_in_rule == {user1.name, user2.name}
 
                 assert len(rule["groups"]) == 2
-                groupnames_in_rule = set([group["name"] for group in rule["groups"]])
+                groupnames_in_rule = {group["name"] for group in rule["groups"]}
                 assert groupnames_in_rule == {
                     group_with_one_owner_and_two_developers,
                     group_with_just_owner,

tests/acceptance/standard/test_group_variables.py

@@ -95,7 +95,7 @@ def test__more_variables(self, gitlab, group_for_function):
         run_gitlabform(config_more_variables, group_for_function)
 
         variables = gitlab.get_group_variables(group_for_function)
-        variables_keys = set([variable["key"] for variable in variables])
+        variables_keys = {variable["key"] for variable in variables}
         assert len(variables) == 2
         assert variables_keys == {"FOO", "BAR"}