summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2020-01-29 19:48:28 -0800
committerDavid Lord <davidism@gmail.com>2020-01-29 21:30:11 -0800
commit89b18c5949ecb6b67badda90f5e01895eabc6aa3 (patch)
tree267cd7bef19bb0381d3eae6b6d0eb24d35ec7d38 /tests
parent92486d009f9288e916baafdf5a9b0741694e5d64 (diff)
downloadmarkupsafe-89b18c5949ecb6b67badda90f5e01895eabc6aa3.tar.gz
remove compat code
Diffstat (limited to 'tests')
-rw-r--r--tests/test_markupsafe.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/tests/test_markupsafe.py b/tests/test_markupsafe.py
index 5b08006..b489fa3 100644
--- a/tests/test_markupsafe.py
+++ b/tests/test_markupsafe.py
@@ -4,14 +4,12 @@ import pytest
from markupsafe import escape
from markupsafe import escape_silent
from markupsafe import Markup
-from markupsafe._compat import PY2
-from markupsafe._compat import text_type
def test_adding():
unsafe = '<script type="application/x-some-script">alert("foo");</script>'
safe = Markup("<em>username</em>")
- assert unsafe + safe == text_type(escape(unsafe)) + text_type(safe)
+ assert unsafe + safe == str(escape(unsafe)) + str(safe)
@pytest.mark.parametrize(
@@ -147,17 +145,9 @@ def test_complex_custom_formatting():
def test_formatting_with_objects():
class Stringable(object):
- def __unicode__(self):
+ def __str__(self):
return u"строка"
- if PY2:
-
- def __str__(self):
- return "some other value"
-
- else:
- __str__ = __unicode__
-
assert Markup("{s}").format(s=Stringable()) == Markup(u"строка")