kallithea Changeset - 5d8bfda01cf5

Changeset - 5d8bfda01cf5

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich (mads) - 5 years ago 2020-11-09 16:48:34
mads@kiilerich.com

Grafted from: eb1df032e43e

lib: drop unnecessary safe_str when processing text

2 files changed with 2 insertions and 6 deletions:

kallithea/lib/helpers.py

kallithea/lib/markup_renderer.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1049,14 +1049,13 @@ def urlify_issues(newtext, repo_name): @@
 def render_w_mentions(source, repo_name=None):
     """
     Render plain text with revision hashes and issue references urlified
     and with @mention highlighting.
     """
     s = safe_str(source)
     s = urlify_text(s, repo_name=repo_name)
     s = urlify_text(source, repo_name=repo_name)
     return literal('<div class="formatted-fixed">%s</div>' % s)
 def changeset_status(repo, revision):
     return ChangesetStatusModel().get_status(repo, revision)

kallithea/lib/markup_renderer.py

➞

Show inline comments

@@ @@ -33,13 +33,13 @@ import traceback @@
 import bleach
 import markdown as markdown_mod
 from docutils.core import publish_parts
 from docutils.parsers.rst import directives
-from kallithea.lib.utils2 import MENTIONS_REGEX, safe_str
 from kallithea.lib.utils2 import MENTIONS_REGEX
 log = logging.getLogger(__name__)
 url_re = re.compile(r'''\bhttps?://(?:[\da-zA-Z0-9@:.-]+)'''
@@ @@ -153,13 +153,12 @@ class MarkupRenderer(object): @@
     @classmethod
     def plain(cls, source, universal_newline=True):
         """
         >>> MarkupRenderer.plain('https://example.com/')
         '<br /><a href="https://example.com/">https://example.com/</a>'
         """
         source = safe_str(source)
         if universal_newline:
             newline = '\n'
             source = newline.join(source.splitlines())
         def url_func(match_obj):
             url_full = match_obj.group(0)
@@ @@ -194,13 +193,12 @@ class MarkupRenderer(object): @@
         <table class="code-highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre>1
 </pre></div></td><td class="code"><div class="code-highlight"><pre><span></span><span class="ch">#!/bin/bash</span>
         <span class="nb">echo</span> <span class="s2">&quot;hello&quot;</span>
         </pre></div>
         </td></tr></table>
         """
         source = safe_str(source)
         try:
             if flavored:
                 source = cls._flavored_markdown(source)
             return markdown_mod.markdown(
                 source,
                 extensions=['markdown.extensions.codehilite', 'markdown.extensions.extra'],
@@ @@ -212,13 +210,12 @@ class MarkupRenderer(object): @@
                 return cls.plain(source)
             else:
                 raise
     @classmethod
     def rst(cls, source, safe=True):
         source = safe_str(source)
         try:
             docutils_settings = dict([(alias, None) for alias in
                                 cls.RESTRUCTUREDTEXT_DISALLOWED_DIRECTIVES])
             docutils_settings.update({'input_encoding': 'unicode',
                                       'report_level': 4})

0 comments (0 inline, 0 general)