summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2014-05-08 16:55:52 +0200
committerArmin Ronacher <armin.ronacher@active-4.com>2014-05-08 16:55:52 +0200
commit58cde05bdcb0a53d87213b4a5bb605937f178171 (patch)
tree8c3072eec8451b4832880bf2720976dc7ae6eac0
parent5090c328fcb777467f32363b1bd6f3561c879ac8 (diff)
downloadmarkupsafe-58cde05bdcb0a53d87213b4a5bb605937f178171.tar.gz
Skip a testcase for 2.60.22baserock/morph
-rw-r--r--markupsafe/tests.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/markupsafe/tests.py b/markupsafe/tests.py
index 02083c6..7481c52 100644
--- a/markupsafe/tests.py
+++ b/markupsafe/tests.py
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
import gc
+import sys
import unittest
from markupsafe import Markup, escape, escape_silent
from markupsafe._compat import text_type
@@ -75,11 +76,15 @@ class MarkupTestCase(unittest.TestCase):
(Markup('{0[1][bar]}').format([0, {'bar': '<bar/>'}]),
'&lt;bar/&gt;'),
(Markup('{0[1][bar]}').format([0, {'bar': Markup('<bar/>')}]),
- '<bar/>'),
- (Markup('{}').format(0),
- Markup('0'))):
+ '<bar/>')):
assert actual == expected, "%r should be %r!" % (actual, expected)
+ # This is new in 2.7
+ if sys.version_info > (2, 6):
+ def test_formatting_empty(self):
+ formatted = Markup('{}').format(0)
+ assert formatted == Markup('0')
+
def test_custom_formatting(self):
class HasHTMLOnly(object):
def __html__(self):