Merging upstream version 0.15.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 4 deletions

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