kallithea Changeset - 13da89053853

Changeset - 13da89053853

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 10 years ago 2016-01-05 16:30:12
madski@unity3d.com

vcs: emails are never unicode so make author_email return strings

1 file changed with 2 insertions and 2 deletions:

kallithea/lib/vcs/utils/__init__.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/utils/__init__.py

➞

Show inline comments

@@ @@ -162,27 +162,27 @@ def author_email(author): @@
         return ''
     import re
     r = author.find('>')
     l = author.find('<')
     if l == -1 or r == -1:
         # fallback to regex match of email out of a string
         email_re = re.compile(r"""[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!"""
                               r"""#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z"""
                               r"""0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]"""
                               r"""*[a-z0-9])?""", re.IGNORECASE)
         m = re.findall(email_re, author)
         return m[0] if m else ''
+        return safe_str(m[0]) if m else ''
     return author[l + 1:r].strip()
+    return safe_str(author[l + 1:r].strip())
 def author_name(author):
     """
     get name of author, or else username.
     It'll try to find an email in the author string and just cut it off
     to get the username
     """
     if not author:
         return ''
     if not '@' in author:
         return author

0 comments (0 inline, 0 general)