kallithea Changeset - beeb69476cc4

Changeset - beeb69476cc4

Parent rev.

Child rev.

[Not reviewed]

stable

0 1 0

Mads Kiilerich - 11 years ago 2015-05-13 01:16:48
madski@unity3d.com

comments: don't eat character before @mention when rendering to rst

The character before @ should not only be ungrouped it should also not be eaten
so re.sub still works as expected.

1 file changed with 2 insertions and 2 deletions:

kallithea/lib/utils2.py

0 comments (0 inline, 0 general)

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -561,15 +561,15 @@ def time_to_datetime(tm): @@
                 tm = float(tm)
             except ValueError:
                 return
         return datetime.datetime.fromtimestamp(tm)
 # Must match regexp in kallithea/public/js/base.js MentionsAutoComplete()
-# Eat char before @ - it must not look like we are in an email addresses.
+# Check char before @ - it must not look like we are in an email addresses.
 # Matching is gready so we don't have to look beyond the end.
 MENTIONS_REGEX = re.compile(r'(?:^|[^a-zA-Z0-9])@([a-zA-Z0-9][-_.a-zA-Z0-9]*[a-zA-Z0-9])')
+MENTIONS_REGEX = re.compile(r'(?:^|(?<=[^a-zA-Z0-9]))@([a-zA-Z0-9][-_.a-zA-Z0-9]*[a-zA-Z0-9])')
 def extract_mentioned_users(s):
     r"""
     Returns unique usernames from given string s that have @mention
     :param s: string to get mentions

0 comments (0 inline, 0 general)