summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoris Roovers <joris.roovers@gmail.com>2022-09-05 11:09:38 +0200
committerGitHub <noreply@github.com>2022-09-05 11:09:38 +0200
commit9c7eac63ec34b96e7b1085ac47c9314d74a7d98b (patch)
tree85d77aee7b2d95dc0e1e541b70dd7f6bd69ecf4a
parent120ab9f9d0977a7545a9f414e2f84e7904200eda (diff)
Pyupgrade: upgrade code to python3.6+ (#329)
Result of running pyupgrade against gitlint, targetting Python 3.6+. This mostly cleans up some unneccesary python 2 compatibility code.
-rw-r--r--examples/my_commit_rules.py2
-rw-r--r--examples/my_configuration_rules.py2
-rw-r--r--examples/my_line_rules.py2
-rw-r--r--gitlint-core/gitlint/config.py6
-rw-r--r--gitlint-core/gitlint/hooks.py3
-rw-r--r--gitlint-core/gitlint/tests/base.py7
-rw-r--r--gitlint-core/gitlint/tests/cli/test_cli.py9
-rw-r--r--gitlint-core/gitlint/tests/cli/test_cli_hooks.py12
-rw-r--r--gitlint-core/gitlint/tests/config/test_config.py2
-rw-r--r--gitlint-core/gitlint/tests/config/test_config_builder.py1
-rw-r--r--gitlint-core/gitlint/tests/config/test_config_precedence.py2
-rw-r--r--gitlint-core/gitlint/tests/config/test_rule_collection.py2
-rw-r--r--gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py1
-rw-r--r--gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py1
-rw-r--r--gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py1
-rw-r--r--gitlint-core/gitlint/tests/contrib/test_contrib_rules.py1
-rw-r--r--gitlint-core/gitlint/tests/git/test_git.py1
-rw-r--r--gitlint-core/gitlint/tests/git/test_git_commit.py1
-rw-r--r--gitlint-core/gitlint/tests/git/test_git_context.py2
-rw-r--r--gitlint-core/gitlint/tests/rules/test_body_rules.py5
-rw-r--r--gitlint-core/gitlint/tests/rules/test_configuration_rules.py1
-rw-r--r--gitlint-core/gitlint/tests/rules/test_meta_rules.py1
-rw-r--r--gitlint-core/gitlint/tests/rules/test_rules.py1
-rw-r--r--gitlint-core/gitlint/tests/rules/test_title_rules.py1
-rw-r--r--gitlint-core/gitlint/tests/rules/test_user_rules.py4
-rw-r--r--gitlint-core/gitlint/tests/samples/user_rules/incorrect_linerule/my_line_rule.py2
-rw-r--r--gitlint-core/gitlint/tests/samples/user_rules/my_commit_rules.py2
-rw-r--r--gitlint-core/gitlint/tests/samples/user_rules/parent_package/__init__.py1
-rw-r--r--gitlint-core/gitlint/tests/samples/user_rules/parent_package/my_commit_rules.py2
-rw-r--r--gitlint-core/gitlint/tests/test_cache.py1
-rw-r--r--gitlint-core/gitlint/tests/test_display.py2
-rw-r--r--gitlint-core/gitlint/tests/test_hooks.py6
-rw-r--r--gitlint-core/gitlint/tests/test_lint.py2
-rw-r--r--gitlint-core/gitlint/tests/test_options.py1
-rw-r--r--gitlint-core/gitlint/tests/test_utils.py2
-rw-r--r--gitlint-core/setup.py3
-rw-r--r--qa/base.py8
-rw-r--r--qa/samples/user_rules/extra/extra_rules.py2
-rw-r--r--qa/test_commits.py1
-rw-r--r--qa/test_config.py1
-rw-r--r--qa/test_contrib.py1
-rw-r--r--qa/test_gitlint.py8
-rw-r--r--qa/test_hooks.py1
-rw-r--r--qa/test_named_rules.py1
-rw-r--r--qa/test_stdin.py4
-rw-r--r--qa/test_user_defined.py1
46 files changed, 26 insertions, 97 deletions
diff --git a/examples/my_commit_rules.py b/examples/my_commit_rules.py
index ad1d21d..35bb836 100644
--- a/examples/my_commit_rules.py
+++ b/examples/my_commit_rules.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from gitlint.rules import CommitRule, RuleViolation
from gitlint.options import IntOption, ListOption
diff --git a/examples/my_configuration_rules.py b/examples/my_configuration_rules.py
index ee3e981..7715c0b 100644
--- a/examples/my_configuration_rules.py
+++ b/examples/my_configuration_rules.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from gitlint.rules import ConfigurationRule
from gitlint.options import IntOption
diff --git a/examples/my_line_rules.py b/examples/my_line_rules.py
index 777854b..58b0108 100644
--- a/examples/my_line_rules.py
+++ b/examples/my_line_rules.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from gitlint.rules import LineRule, RuleViolation, CommitMessageTitle
from gitlint.options import ListOption
diff --git a/gitlint-core/gitlint/config.py b/gitlint-core/gitlint/config.py
index f27a577..3bc944b 100644
--- a/gitlint-core/gitlint/config.py
+++ b/gitlint-core/gitlint/config.py
@@ -1,7 +1,6 @@
from configparser import ConfigParser, Error as ConfigParserError
import copy
-import io
import re
import os
import shutil
@@ -376,8 +375,7 @@ class RuleCollection:
del self._rules[rule.id]
def __iter__(self):
- for rule in self._rules.values():
- yield rule
+ yield from self._rules.values()
def __eq__(self, other):
return isinstance(other, RuleCollection) and self._rules == other._rules
@@ -454,7 +452,7 @@ class LintConfigBuilder:
try:
parser = ConfigParser()
- with io.open(filename, encoding=DEFAULT_ENCODING) as config_file:
+ with open(filename, encoding=DEFAULT_ENCODING) as config_file:
parser.read_file(config_file, filename)
for section_name in parser.sections():
diff --git a/gitlint-core/gitlint/hooks.py b/gitlint-core/gitlint/hooks.py
index 1e03f3a..78c5e46 100644
--- a/gitlint-core/gitlint/hooks.py
+++ b/gitlint-core/gitlint/hooks.py
@@ -1,4 +1,3 @@
-import io
import shutil
import os
import stat
@@ -53,7 +52,7 @@ class GitHookInstaller:
if not os.path.exists(dest_path):
raise GitHookInstallerError(f"There is no commit-msg hook present in {dest_path}.")
- with io.open(dest_path, encoding=DEFAULT_ENCODING) as fp:
+ with open(dest_path, encoding=DEFAULT_ENCODING) as fp:
lines = fp.readlines()
if len(lines) < 2 or lines[1] != GITLINT_HOOK_IDENTIFIER:
msg = (
diff --git a/gitlint-core/gitlint/tests/base.py b/gitlint-core/gitlint/tests/base.py
index 42a4bec..108725e 100644
--- a/gitlint-core/gitlint/tests/base.py
+++ b/gitlint-core/gitlint/tests/base.py
@@ -1,8 +1,5 @@
-# -*- coding: utf-8 -*-
-
import contextlib
import copy
-import io
import logging
import os
import re
@@ -59,7 +56,7 @@ class BaseTestCase(unittest.TestCase):
def get_sample(filename=""):
"""Read and return the contents of a file in gitlint/tests/samples"""
sample_path = BaseTestCase.get_sample_path(filename)
- with io.open(sample_path, encoding=DEFAULT_ENCODING) as content:
+ with open(sample_path, encoding=DEFAULT_ENCODING) as content:
sample = content.read()
return sample
@@ -75,7 +72,7 @@ class BaseTestCase(unittest.TestCase):
"""Utility method to read an expected file from gitlint/tests/expected and return it as a string.
Optionally replace template variables specified by variable_dict."""
expected_path = os.path.join(BaseTestCase.EXPECTED_DIR, filename)
- with io.open(expected_path, encoding=DEFAULT_ENCODING) as content:
+ with open(expected_path, encoding=DEFAULT_ENCODING) as content:
expected = content.read()
if variable_dict:
diff --git a/gitlint-core/gitlint/tests/cli/test_cli.py b/gitlint-core/gitlint/tests/cli/test_cli.py
index 89dd031..2e8a938 100644
--- a/gitlint-core/gitlint/tests/cli/test_cli.py
+++ b/gitlint-core/gitlint/tests/cli/test_cli.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
import io
import os
import sys
@@ -29,7 +26,7 @@ class CLITests(BaseTestCase):
GITLINT_SUCCESS_CODE = 0
def setUp(self):
- super(CLITests, self).setUp()
+ super().setUp()
self.cli = CliRunner()
# Patch gitlint.cli.git_version() so that we don't have to patch it separately in every test
@@ -321,7 +318,7 @@ class CLITests(BaseTestCase):
with self.tempdir() as tmpdir:
msg_filename = os.path.join(tmpdir, "msg")
- with io.open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
+ with open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
f.write("WIP: msg-filename tïtle\n")
with patch("gitlint.display.stderr", new=StringIO()) as stderr:
@@ -371,7 +368,7 @@ class CLITests(BaseTestCase):
with self.tempdir() as tmpdir:
msg_filename = os.path.join(tmpdir, "msg")
- with io.open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
+ with open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
f.write("Commït title\n")
with patch("gitlint.display.stderr", new=StringIO()) as stderr:
diff --git a/gitlint-core/gitlint/tests/cli/test_cli_hooks.py b/gitlint-core/gitlint/tests/cli/test_cli_hooks.py
index 264fb6f..826b03c 100644
--- a/gitlint-core/gitlint/tests/cli/test_cli_hooks.py
+++ b/gitlint-core/gitlint/tests/cli/test_cli_hooks.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
import io
from io import StringIO
import os
@@ -23,7 +21,7 @@ class CLIHookTests(BaseTestCase):
CONFIG_ERROR_CODE = 255
def setUp(self):
- super(CLIHookTests, self).setUp()
+ super().setUp()
self.cli = CliRunner()
# Patch gitlint.cli.git_version() so that we don't have to patch it separately in every test
@@ -110,7 +108,7 @@ class CLIHookTests(BaseTestCase):
with self.tempdir() as tmpdir:
msg_filename = os.path.join(tmpdir, "hür")
- with io.open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
+ with open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
f.write("WIP: tïtle\n")
with patch("gitlint.display.stderr", new=StringIO()) as stderr:
@@ -139,7 +137,7 @@ class CLIHookTests(BaseTestCase):
with self.patch_input(["e", "e", "n"]):
with self.tempdir() as tmpdir:
msg_filename = os.path.realpath(os.path.join(tmpdir, "hür"))
- with io.open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
+ with open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
f.write(commit_messages[i] + "\n")
with patch("gitlint.display.stderr", new=StringIO()) as stderr:
@@ -168,7 +166,7 @@ class CLIHookTests(BaseTestCase):
with self.patch_input(["n"]):
with self.tempdir() as tmpdir:
msg_filename = os.path.join(tmpdir, "hür")
- with io.open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
+ with open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
f.write("WIP: höok no\n")
with patch("gitlint.display.stderr", new=StringIO()) as stderr:
@@ -186,7 +184,7 @@ class CLIHookTests(BaseTestCase):
with self.patch_input(["y"]):
with self.tempdir() as tmpdir:
msg_filename = os.path.join(tmpdir, "hür")
- with io.open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
+ with open(msg_filename, "w", encoding=DEFAULT_ENCODING) as f:
f.write("WIP: höok yes\n")
with patch("gitlint.display.stderr", new=StringIO()) as stderr:
diff --git a/gitlint-core/gitlint/tests/config/test_config.py b/gitlint-core/gitlint/tests/config/test_config.py
index 0dcacd7..da7aeb3 100644
--- a/gitlint-core/gitlint/tests/config/test_config.py
+++ b/gitlint-core/gitlint/tests/config/test_config.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from unittest.mock import patch
from gitlint import rules
diff --git a/gitlint-core/gitlint/tests/config/test_config_builder.py b/gitlint-core/gitlint/tests/config/test_config_builder.py
index 245b980..dfb77cd 100644
--- a/gitlint-core/gitlint/tests/config/test_config_builder.py
+++ b/gitlint-core/gitlint/tests/config/test_config_builder.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
import copy
from gitlint.tests.base import BaseTestCase
diff --git a/gitlint-core/gitlint/tests/config/test_config_precedence.py b/gitlint-core/gitlint/tests/config/test_config_precedence.py
index f0aabef..16e142b 100644
--- a/gitlint-core/gitlint/tests/config/test_config_precedence.py
+++ b/gitlint-core/gitlint/tests/config/test_config_precedence.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from io import StringIO
from click.testing import CliRunner
diff --git a/gitlint-core/gitlint/tests/config/test_rule_collection.py b/gitlint-core/gitlint/tests/config/test_rule_collection.py
index ee08278..ea7039f 100644
--- a/gitlint-core/gitlint/tests/config/test_rule_collection.py
+++ b/gitlint-core/gitlint/tests/config/test_rule_collection.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from collections import OrderedDict
from gitlint import rules
from gitlint.config import RuleCollection
diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py b/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py
index 1aceba7..7ce9c89 100644
--- a/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py
+++ b/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from gitlint.tests.base import BaseTestCase
from gitlint.rules import RuleViolation
from gitlint.contrib.rules.conventional_commit import ConventionalCommit
diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py b/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py
index 7eac9e1..841640a 100644
--- a/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py
+++ b/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from gitlint.tests.base import BaseTestCase
from gitlint.rules import RuleViolation
from gitlint.contrib.rules.disallow_cleanup_commits import DisallowCleanupCommits
diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py b/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py
index 63a9b0c..88ff1db 100644
--- a/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py
+++ b/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from gitlint.tests.base import BaseTestCase
from gitlint.rules import RuleViolation
from gitlint.contrib.rules.signedoff_by import SignedOffBy
diff --git a/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py b/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py
index 333fae0..bd098c6 100644
--- a/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py
+++ b/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
import os
from gitlint.tests.base import BaseTestCase
diff --git a/gitlint-core/gitlint/tests/git/test_git.py b/gitlint-core/gitlint/tests/git/test_git.py
index 72984f0..9c73bd9 100644
--- a/gitlint-core/gitlint/tests/git/test_git.py
+++ b/gitlint-core/gitlint/tests/git/test_git.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
import os
from unittest.mock import patch, call
diff --git a/gitlint-core/gitlint/tests/git/test_git_commit.py b/gitlint-core/gitlint/tests/git/test_git_commit.py
index 07eb3c2..2aa7be8 100644
--- a/gitlint-core/gitlint/tests/git/test_git_commit.py
+++ b/gitlint-core/gitlint/tests/git/test_git_commit.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
import copy
import datetime
diff --git a/gitlint-core/gitlint/tests/git/test_git_context.py b/gitlint-core/gitlint/tests/git/test_git_context.py
index d5df1bb..3dcbe4a 100644
--- a/gitlint-core/gitlint/tests/git/test_git_context.py
+++ b/gitlint-core/gitlint/tests/git/test_git_context.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from unittest.mock import patch, call
from gitlint.tests.base import BaseTestCase
diff --git a/gitlint-core/gitlint/tests/rules/test_body_rules.py b/gitlint-core/gitlint/tests/rules/test_body_rules.py
index 829bfd8..94b1edf 100644
--- a/gitlint-core/gitlint/tests/rules/test_body_rules.py
+++ b/gitlint-core/gitlint/tests/rules/test_body_rules.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from gitlint.tests.base import BaseTestCase
from gitlint import rules
@@ -101,13 +100,13 @@ class BodyRuleTests(BaseTestCase):
expected_violation = rules.RuleViolation("B5", "Body message is too short (21<120)", "å" * 21, 3)
rule = rules.BodyMinLength({"min-length": 120})
- commit = self.gitcommit("Title\n\n{0}\n".format("å" * 21)) # pylint: disable=consider-using-f-string
+ commit = self.gitcommit("Title\n\n{}\n".format("å" * 21)) # pylint: disable=consider-using-f-string
violations = rule.validate(commit)
self.assertListEqual(violations, [expected_violation])
# Make sure we don't get the error if the body-length is exactly the min-length
rule = rules.BodyMinLength({"min-length": 8})
- commit = self.gitcommit("Tïtle\n\n{0}\n".format("å" * 8)) # pylint: disable=consider-using-f-string
+ commit = self.gitcommit("Tïtle\n\n{}\n".format("å" * 8)) # pylint: disable=consider-using-f-string
violations = rule.validate(commit)
self.assertIsNone(violations)
diff --git a/gitlint-core/gitlint/tests/rules/test_configuration_rules.py b/gitlint-core/gitlint/tests/rules/test_configuration_rules.py
index d701e2d..24fcde5 100644
--- a/gitlint-core/gitlint/tests/rules/test_configuration_rules.py
+++ b/gitlint-core/gitlint/tests/rules/test_configuration_rules.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from gitlint.tests.base import BaseTestCase
from gitlint import rules
from gitlint.config import LintConfig
diff --git a/gitlint-core/gitlint/tests/rules/test_meta_rules.py b/gitlint-core/gitlint/tests/rules/test_meta_rules.py
index e4c914d..50bc64e 100644
--- a/gitlint-core/gitlint/tests/rules/test_meta_rules.py
+++ b/gitlint-core/gitlint/tests/rules/test_meta_rules.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from gitlint.tests.base import BaseTestCase
from gitlint.rules import AuthorValidEmail, RuleViolation
diff --git a/gitlint-core/gitlint/tests/rules/test_rules.py b/gitlint-core/gitlint/tests/rules/test_rules.py
index 73684ca..199cc7e 100644
--- a/gitlint-core/gitlint/tests/rules/test_rules.py
+++ b/gitlint-core/gitlint/tests/rules/test_rules.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from gitlint.tests.base import BaseTestCase
from gitlint.rules import Rule, RuleViolation
diff --git a/gitlint-core/gitlint/tests/rules/test_title_rules.py b/gitlint-core/gitlint/tests/rules/test_title_rules.py
index ebcce79..4796e54 100644
--- a/gitlint-core/gitlint/tests/rules/test_title_rules.py
+++ b/gitlint-core/gitlint/tests/rules/test_title_rules.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from gitlint.tests.base import BaseTestCase
from gitlint.rules import (
TitleMaxLength,
diff --git a/gitlint-core/gitlint/tests/rules/test_user_rules.py b/gitlint-core/gitlint/tests/rules/test_user_rules.py
index 99cecc9..fc8d423 100644
--- a/gitlint-core/gitlint/tests/rules/test_user_rules.py
+++ b/gitlint-core/gitlint/tests/rules/test_user_rules.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
import os
import sys
@@ -72,7 +70,7 @@ class UserRuleTests(BaseTestCase):
classes = find_rule_classes(user_rule_path)
# convert classes to strings and sort them so we can compare them
- class_strings = sorted([str(clazz) for clazz in classes])
+ class_strings = sorted(str(clazz) for clazz in classes)
expected = ["<class 'my_commit_rules.MyUserCommitRule'>", "<class 'parent_package.InitFileRule'>"]
self.assertListEqual(class_strings, expected)
diff --git a/gitlint-core/gitlint/tests/samples/user_rules/incorrect_linerule/my_line_rule.py b/gitlint-core/gitlint/tests/samples/user_rules/incorrect_linerule/my_line_rule.py
index 004ef9d..b23b5bf 100644
--- a/gitlint-core/gitlint/tests/samples/user_rules/incorrect_linerule/my_line_rule.py
+++ b/gitlint-core/gitlint/tests/samples/user_rules/incorrect_linerule/my_line_rule.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from gitlint.rules import LineRule
diff --git a/gitlint-core/gitlint/tests/samples/user_rules/my_commit_rules.py b/gitlint-core/gitlint/tests/samples/user_rules/my_commit_rules.py
index 3db135e..02c922d 100644
--- a/gitlint-core/gitlint/tests/samples/user_rules/my_commit_rules.py
+++ b/gitlint-core/gitlint/tests/samples/user_rules/my_commit_rules.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from gitlint.rules import CommitRule, RuleViolation
from gitlint.options import IntOption
diff --git a/gitlint-core/gitlint/tests/samples/user_rules/parent_package/__init__.py b/gitlint-core/gitlint/tests/samples/user_rules/parent_package/__init__.py
index 9ea5371..22c3f65 100644
--- a/gitlint-core/gitlint/tests/samples/user_rules/parent_package/__init__.py
+++ b/gitlint-core/gitlint/tests/samples/user_rules/parent_package/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# This file is meant to test that we can also load rules from __init__.py files, this was an issue with pypy before.
from gitlint.rules import CommitRule
diff --git a/gitlint-core/gitlint/tests/samples/user_rules/parent_package/my_commit_rules.py b/gitlint-core/gitlint/tests/samples/user_rules/parent_package/my_commit_rules.py
index b143e62..f91cb07 100644
--- a/gitlint-core/gitlint/tests/samples/user_rules/parent_package/my_commit_rules.py
+++ b/gitlint-core/gitlint/tests/samples/user_rules/parent_package/my_commit_rules.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from gitlint.rules import CommitRule
diff --git a/gitlint-core/gitlint/tests/test_cache.py b/gitlint-core/gitlint/tests/test_cache.py
index 71bc1be..9c327dc 100644
--- a/gitlint-core/gitlint/tests/test_cache.py
+++ b/gitlint-core/gitlint/tests/test_cache.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from gitlint.tests.base import BaseTestCase
from gitlint.cache import PropertyCache, cache
diff --git a/gitlint-core/gitlint/tests/test_display.py b/gitlint-core/gitlint/tests/test_display.py
index b5bdbee..1f759d2 100644
--- a/gitlint-core/gitlint/tests/test_display.py
+++ b/gitlint-core/gitlint/tests/test_display.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from io import StringIO
from unittest.mock import patch # pylint: disable=no-name-in-module, import-error
diff --git a/gitlint-core/gitlint/tests/test_hooks.py b/gitlint-core/gitlint/tests/test_hooks.py
index 116b2f8..f92b148 100644
--- a/gitlint-core/gitlint/tests/test_hooks.py
+++ b/gitlint-core/gitlint/tests/test_hooks.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
import os
from unittest.mock import patch, ANY, mock_open
@@ -85,7 +83,7 @@ class HookTests(BaseTestCase):
git_hooks_dir.return_value = os.path.join("/föo", "bar", ".git", "hooks")
lint_config.target = os.path.join("/hür", "dur")
read_data = "#!/bin/sh\n" + GITLINT_HOOK_IDENTIFIER
- with patch("gitlint.hooks.io.open", mock_open(read_data=read_data), create=True):
+ with patch("builtins.open", mock_open(read_data=read_data), create=True):
GitHookInstaller.uninstall_commit_msg_hook(lint_config)
expected_dst = os.path.join(git_hooks_dir.return_value, COMMIT_MSG_HOOK_DST_PATH)
@@ -133,7 +131,7 @@ class HookTests(BaseTestCase):
"(or it was modified).\nUninstallation of 3th party or modified gitlint hooks "
"is not supported."
)
- with patch("gitlint.hooks.io.open", mock_open(read_data=read_data), create=True):
+ with patch("builtins.open", mock_open(read_data=read_data), create=True):
with self.assertRaisesMessage(GitHookInstallerError, expected_msg):
GitHookInstaller.uninstall_commit_msg_hook(lint_config)
remove.assert_not_called()
diff --git a/gitlint-core/gitlint/tests/test_lint.py b/gitlint-core/gitlint/tests/test_lint.py
index 394f1ef..2af4615 100644
--- a/gitlint-core/gitlint/tests/test_lint.py
+++ b/gitlint-core/gitlint/tests/test_lint.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
from io import StringIO
from unittest.mock import patch # pylint: di