Remove have_unicode checks and merge those tests into the
normal code (or drop them if they only repeat previous
tests).
diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index 937aa7e..07a796f 100755
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -752,35 +752,34 @@
tests.append(CharacterTest)
-if test_support.have_unicode:
- class UnicodeTest(StringTest):
- typecode = 'u'
- example = '\x01\u263a\x00\ufeff'
- smallerexample = '\x01\u263a\x00\ufefe'
- biggerexample = '\x01\u263a\x01\ufeff'
- outside = str('\x33')
- minitemsize = 2
+class UnicodeTest(StringTest):
+ typecode = 'u'
+ example = '\x01\u263a\x00\ufeff'
+ smallerexample = '\x01\u263a\x00\ufefe'
+ biggerexample = '\x01\u263a\x01\ufeff'
+ outside = str('\x33')
+ minitemsize = 2
- def test_unicode(self):
- self.assertRaises(TypeError, array.array, 'b', 'foo')
+ def test_unicode(self):
+ self.assertRaises(TypeError, array.array, 'b', 'foo')
- a = array.array('u', '\xa0\xc2\u1234')
- a.fromunicode(' ')
- a.fromunicode('')
- a.fromunicode('')
- a.fromunicode('\x11abc\xff\u1234')
- s = a.tounicode()
- self.assertEqual(s, '\xa0\xc2\u1234 \x11abc\xff\u1234')
+ a = array.array('u', '\xa0\xc2\u1234')
+ a.fromunicode(' ')
+ a.fromunicode('')
+ a.fromunicode('')
+ a.fromunicode('\x11abc\xff\u1234')
+ s = a.tounicode()
+ self.assertEqual(s, '\xa0\xc2\u1234 \x11abc\xff\u1234')
- s = '\x00="\'a\\b\x80\xff\u0000\u0001\u1234'
- a = array.array('u', s)
- self.assertEqual(
- repr(a),
- "array('u', '\\x00=\"\\'a\\\\b\\x80\\xff\\x00\\x01\\u1234')")
+ s = '\x00="\'a\\b\x80\xff\u0000\u0001\u1234'
+ a = array.array('u', s)
+ self.assertEqual(
+ repr(a),
+ "array('u', '\\x00=\"\\'a\\\\b\\x80\\xff\\x00\\x01\\u1234')")
- self.assertRaises(TypeError, a.fromunicode)
+ self.assertRaises(TypeError, a.fromunicode)
- tests.append(UnicodeTest)
+tests.append(UnicodeTest)
class NumberTest(BaseTest):