Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12541 from edx/robrap/fix-imports

Browse Source 
Fix import order for HTML, Text.
This commit is contained in:
Robert Raposa
2016-05-25 15:23:08 -04:00
parent e613b7f460 addb5bf634
commit ebf89d63e9
33 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/core/djangolib/markup.py
View File

@@ -23,7 +23,7 @@ def HTML(html): # pylint: disable=invalid-name
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
${Text(_("Write & send {start}email{end}")).format(
start=HTML("<a href='mailto:{}'>").format(user.email),

4
openedx/core/djangolib/tests/test_markup.py
View File

@@ -10,7 +10,7 @@ import ddt
from django.utils.translation import ugettext as _, ungettext
from mako.template import Template
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
@attr('shard_2')
@@ -60,7 +60,7 @@ class FormatHtmlTest(unittest.TestCase):
<%!
from django.utils.translation import ugettext as _
from openedx.core.djangolib.markup import Text, HTML
from openedx.core.djangolib.markup import HTML, Text
%>
${Text(_(u"A & {BC}")).format(BC=HTML("B & C"))}
""",