Skip to content

Fixes failing formatting of DAG file containing {} in docstring #9779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Jul 12, 2020
Merged

Fixes failing formatting of DAG file containing {} in docstring #9779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions airflow/www/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ def wrapped_markdown(s, css_class=None):
return None

return Markup(
'<div class="rich_doc {css_class}" >' + markdown.markdown(s) + "</div>"
).format(css_class=css_class)
'<div class="rich_doc {css_class}" >'.format(css_class=css_class) + markdown.markdown(s) + "</div>"
)


def get_attr_renderer():
Expand Down
14 changes: 14 additions & 0 deletions tests/www/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from parameterized import parameterized

from airflow.www import utils
from airflow.www.utils import wrapped_markdown
from tests.test_utils.config import conf_vars


Expand Down Expand Up @@ -229,3 +230,16 @@ def test_markdown(self):
def test_markdown_none(self):
rendered = self.attr_renderer["python_callable"](None)
self.assertEqual("", rendered)


class TestWrappedMarkdown(unittest.TestCase):

def test_wrapped_markdown_with_docstring_curly_braces(self):
rendered = wrapped_markdown("{braces}", css_class="a_class")
self.assertEqual('<div class="rich_doc a_class" ><p>{braces}</p></div>', rendered)

def test_wrapped_markdown_with_some_markdown(self):
rendered = wrapped_markdown("*italic*\n**bold**\n", css_class="a_class")
self.assertEqual(
'''<div class="rich_doc a_class" ><p><em>italic</em>
<strong>bold</strong></p></div>''', rendered)