changeset 5625:13da89053853

vcs: emails are never unicode so make author_email return strings
author Mads Kiilerich <madski@unity3d.com>
date Tue, 05 Jan 2016 16:30:12 +0100
parents 6de3e8907554
children 8eebcf50fdd5
files kallithea/lib/vcs/utils/__init__.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/vcs/utils/__init__.py	Tue Jan 05 16:30:12 2016 +0100
+++ b/kallithea/lib/vcs/utils/__init__.py	Tue Jan 05 16:30:12 2016 +0100
@@ -171,9 +171,9 @@
                               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):