summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-12-02 07:24:06 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-12-02 07:24:06 (GMT)
commit83cf99d733acb49c70dd9548eeccfc724e707531 (patch)
tree2b0f3a1cf6d3fc28556ad920f10879d6bb69f5d9 /Lib
parent9d98c9bf42412e05b5352329c6f141df49dd8df7 (diff)
downloadcpython-83cf99d733acb49c70dd9548eeccfc724e707531.zip
cpython-83cf99d733acb49c70dd9548eeccfc724e707531.tar.gz
cpython-83cf99d733acb49c70dd9548eeccfc724e707531.tar.bz2
Issue #20335: bytes constructor now raises TypeError when encoding or errors
is specified with non-string argument. Based on patch by Renaud Blanch.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_bytes.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 0177749..7b66a5e 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -100,6 +100,14 @@ class BaseBytesTest:
self.assertRaises(TypeError, self.type2test, [0.0])
self.assertRaises(TypeError, self.type2test, [None])
self.assertRaises(TypeError, self.type2test, [C()])
+ self.assertRaises(TypeError, self.type2test, 0, 'ascii')
+ self.assertRaises(TypeError, self.type2test, b'', 'ascii')
+ self.assertRaises(TypeError, self.type2test, 0, errors='ignore')
+ self.assertRaises(TypeError, self.type2test, b'', errors='ignore')
+ self.assertRaises(TypeError, self.type2test, '')
+ self.assertRaises(TypeError, self.type2test, '', errors='ignore')
+ self.assertRaises(TypeError, self.type2test, '', b'ascii')
+ self.assertRaises(TypeError, self.type2test, '', 'ascii', b'ignore')
def test_constructor_value_errors(self):
self.assertRaises(ValueError, self.type2test, [-1])