summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2016-01-13 23:15:30 +0100
committerArmin Ronacher <armin.ronacher@active-4.com>2016-01-13 23:15:30 +0100
commit01fd863228351b53603e4d1eedb66725c05520ab (patch)
treeb4126de14ab8a020813ac6f2290ad0c060e739f2
parent425762c633815cabe7f89321593b7358bf1dba88 (diff)
downloadmarkupsafe-01fd863228351b53603e4d1eedb66725c05520ab.tar.gz
Added a missing import and cleaned up flake8 warnings
-rw-r--r--markupsafe/tests.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/markupsafe/tests.py b/markupsafe/tests.py
index b7aae4d..f3e2379 100644
--- a/markupsafe/tests.py
+++ b/markupsafe/tests.py
@@ -3,7 +3,7 @@ import gc
import sys
import unittest
from markupsafe import Markup, escape, escape_silent
-from markupsafe._compat import text_type
+from markupsafe._compat import text_type, PY2
class MarkupTestCase(unittest.TestCase):
@@ -68,8 +68,8 @@ class MarkupTestCase(unittest.TestCase):
def test_unescape(self):
assert Markup("&lt;test&gt;").unescape() == "<test>"
assert "jack & tavi are cooler than mike & russ" == \
- Markup("jack & tavi are cooler than mike &amp; russ").unescape(), \
- Markup("jack & tavi are cooler than mike &amp; russ").unescape()
+ Markup("jack & tavi are cooler than mike &amp; russ").unescape(), \
+ Markup("jack & tavi are cooler than mike &amp; russ").unescape()
# Test that unescape is idempotent
original = '&foo&#x3b;'
@@ -134,11 +134,12 @@ class MarkupTestCase(unittest.TestCase):
def test_formatting_with_objects(self):
class Stringable(object):
- def __str__(self):
- return 'some other value'
def __unicode__(self):
return u'строка'
- if not PY2:
+ if PY2:
+ def __str__(self):
+ return 'some other value'
+ else:
__str__ = __unicode__
assert Markup('{s}').format(s=Stringable()) == \
@@ -182,9 +183,11 @@ class MarkupLeakTestCase(unittest.TestCase):
escape("<foo>")
escape(u"foo")
escape(u"<foo>")
- if hasattr(sys, 'pypy_version_info'): gc.collect()
+ if hasattr(sys, 'pypy_version_info'):
+ gc.collect()
counts.add(len(gc.get_objects()))
- assert len(counts) == 1, 'ouch, c extension seems to leak objects, got: ' + str(len(counts))
+ assert len(counts) == 1, 'ouch, c extension seems to ' \
+ 'leak objects, got: ' + str(len(counts))
def suite():