kallithea Changeset - 82198c193c11

Changeset - 82198c193c11

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: improve html_escape

Repeated string replace is faster than iterating over each character in Python
and doing a dict lookup.

1 file changed with 13 insertions and 15 deletions:

kallithea/lib/helpers.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -80,36 +80,35 @@ def canonical_url(*args, **kargs): @@
     return url(*args, **kargs)
 def canonical_hostname():
     '''Return canonical hostname of system'''
     from kallithea import CONFIG
     try:
         parts = CONFIG.get('canonical_url', '').split('://', 1)
         return parts[1].split('/', 1)[0]
     except IndexError:
         parts = url('home', qualified=True).split('://', 1)
         return parts[1].split('/', 1)[0]
 def html_escape(text, html_escape_table=None):
     """Produce entities within text."""
     if not html_escape_table:
         html_escape_table = {
             "&": "&amp;",
             '"': "&quot;",
             "'": "&apos;",
             ">": "&gt;",
             "<": "&lt;",
+        }
     return "".join(html_escape_table.get(c, c) for c in text)
 def html_escape(text):
     """Return string with all html escaped.
     This is also safe for javascript in html but not necessarily correct.
     """
     return (text
         .replace('&', '&amp;')
         .replace(">", "&gt;")
         .replace("<", "&lt;")
         .replace('"', "&quot;")
         .replace("'", "&apos;")
+        )
 def shorter(text, size=20):
     postfix = '...'
     if len(text) > size:
         return text[:size - len(postfix)] + postfix
     return text
 def _reset(name, value=None, id=NotGiven, type="reset", **attrs):
     """
     Reset button
     """
@@ @@ -1311,29 +1310,28 @@ def linkify_others(t, l): @@
     return ''.join(links)
 def urlify_commit(text_, repository, link_=None):
     """
     Parses given text message and makes proper links.
     issues are linked to given issue-server, and rest is a changeset link
     if link_ is given, in other case it's a plain text
     :param text_:
     :param repository:
     :param link_: changeset link
     """
     def escaper(string):
         return string.replace('<', '&lt;').replace('>', '&gt;')
     newtext = html_escape(text_)
     # urlify changesets - extract revisions and make link out of them
-    newtext = urlify_changesets(escaper(text_), repository)
+    newtext = urlify_changesets(newtext, repository)
     # extract http/https links and make them real urls
     newtext = urlify_text(newtext, safe=False)
     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

0 comments (0 inline, 0 general)