summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-07-26 14:59:45 (GMT)
committerLarry Hastings <larry@hastings.org>2015-07-26 14:59:45 (GMT)
commit71427eea74e4d8c5312da94b24dfaefaebe60e82 (patch)
tree0731d87a3412e8b8174cc99e787fdd45f169b296 /Lib
parent3d1dc904f438117eaea70dd8b67d81dec4d53b58 (diff)
parentf002225f7e0b82af64f5f524ed870b83a226557c (diff)
downloadcpython-71427eea74e4d8c5312da94b24dfaefaebe60e82.zip
cpython-71427eea74e4d8c5312da94b24dfaefaebe60e82.tar.gz
cpython-71427eea74e4d8c5312da94b24dfaefaebe60e82.tar.bz2
Merge Python 3.5.0b4 changes back with 3.5 branch head.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_json/test_separators.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/Lib/test/test_json/test_separators.py b/Lib/test/test_json/test_separators.py
index 84a2be9..8ca5174 100644
--- a/Lib/test/test_json/test_separators.py
+++ b/Lib/test/test_json/test_separators.py
@@ -39,6 +39,12 @@ class TestSeparators:
self.assertEqual(h2, h)
self.assertEqual(d2, expect)
+ def test_illegal_separators(self):
+ h = {1: 2, 3: 4}
+ self.assertRaises(TypeError, self.dumps, h, separators=(b', ', ': '))
+ self.assertRaises(TypeError, self.dumps, h, separators=(', ', b': '))
+ self.assertRaises(TypeError, self.dumps, h, separators=(b', ', b': '))
+
class TestPySeparators(TestSeparators, PyTest): pass
class TestCSeparators(TestSeparators, CTest): pass