From 3313b4f9c3c5d6a579588e77068ca3ae3edffe2b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 25 Jan 2021 14:26:08 +0100 Subject: Adding upstream version 0.15.0. Signed-off-by: Daniel Baumann --- gitlint/contrib/rules/conventional_commit.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gitlint/contrib/rules/conventional_commit.py') diff --git a/gitlint/contrib/rules/conventional_commit.py b/gitlint/contrib/rules/conventional_commit.py index 8530343..71f6adf 100644 --- a/gitlint/contrib/rules/conventional_commit.py +++ b/gitlint/contrib/rules/conventional_commit.py @@ -2,7 +2,6 @@ import re from gitlint.options import ListOption from gitlint.rules import CommitMessageTitle, LineRule, RuleViolation -from gitlint.utils import ustr RULE_REGEX = re.compile(r"[^(]+?(\([^)]+?\))?: .+") @@ -26,14 +25,14 @@ class ConventionalCommit(LineRule): violations = [] for commit_type in self.options["types"].value: - if line.startswith(ustr(commit_type)): + if line.startswith(commit_type): break else: - msg = u"Title does not start with one of {0}".format(', '.join(self.options['types'].value)) + msg = "Title does not start with one of {0}".format(', '.join(self.options['types'].value)) violations.append(RuleViolation(self.id, msg, line)) if not RULE_REGEX.match(line): - msg = u"Title does not follow ConventionalCommits.org format 'type(optional-scope): description'" + msg = "Title does not follow ConventionalCommits.org format 'type(optional-scope): description'" violations.append(RuleViolation(self.id, msg, line)) return violations -- cgit v1.2.3