kallithea Changeset - d60f54b3eeb3

Changeset - d60f54b3eeb3

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 10 years ago 2015-06-19 18:00:42
madski@unity3d.com

helpers: extract internal _urlify_text function from urlify_text

1 file changed with 10 insertions and 10 deletions:

kallithea/lib/helpers.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1255,39 +1255,39 @@ def fancy_file_stats(stats): @@
     a_v = a if a > 0 else ''
     d_v = d if d > 0 else ''
     d_a = '<div class="added %s" style="width:%s%%">%s</div>' % (
         cgen('a', a_v, d_v), a_p, a_v
+    )
     d_d = '<div class="deleted %s" style="width:%s%%">%s</div>' % (
         cgen('d', a_v, d_v), d_p, d_v
+    )
     return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
-def urlify_text(text_, safe=True):
+def _urlify_text(s):
     """
     Extract urls from text and make html links out of them
     :param text_:
     """
     def url_func(match_obj):
-        url_full = match_obj.groups()[0]
+        url_full = match_obj.group(1)
         return '<a href="%(url)s">%(url)s</a>' % ({'url': url_full})
     _newtext = url_re.sub(url_func, text_)
     if safe:
         return literal(_newtext)
     return _newtext
     return url_re.sub(url_func, s)
 def urlify_text(s):
     """
     Extract urls from text and make literal html links out of them
     """
     s = _urlify_text(s)
     return literal(s)
 def urlify_changesets(text_, repository):
     """
     Extract revision ids from changeset and make link from them
     :param text_:
     :param repository: repo name to build the URL with
     """
     from pylons import url  # doh, we need to re-import url to mock it later
     def url_func(match_obj):
         rev = match_obj.group(0)
@@ @@ -1316,25 +1316,25 @@ def urlify_commit(text_, repository, lin @@
     if link_ is given, in other case it's a plain text
     :param text_:
     :param repository:
     :param link_: changeset link
     """
     newtext = html_escape(text_)
     # urlify changesets - extract revisions and make link out of them
     newtext = urlify_changesets(newtext, repository)
     # extract http/https links and make them real urls
-    newtext = urlify_text(newtext, safe=False)
+    newtext = _urlify_text(newtext)
     newtext = urlify_issues(newtext, repository, link_)
     return literal(newtext)
 def urlify_issues(newtext, repository, link_=None):
     from kallithea import CONFIG as conf
     # allow multiple issue servers to be used
     valid_indices = [
         x.group(1)
         for x in map(lambda x: re.match(r'issue_pat(.*)', x), conf.keys())

0 comments (0 inline, 0 general)