commit f6d1b5120062293a3957b63a10fd483ae35f9871
author Serhiy Storchaka <storchaka@gmail.com> Sun May 31 11:56:48 2015 +0300
committer Serhiy Storchaka <storchaka@gmail.com> Sun May 31 11:56:48 2015 +0300
tree f2193151f291f9dd45d35ac1c0a95363f882f2c4
parent 79b13db900687a5bd5283693d11cb655ec98b2a2

Fixed the array module in unicode disabled build (regression of issue20014).

Lib/test/test_array.py

diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index 7256b94..105cf73 100644
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -18,7 +18,9 @@
         array.array.__init__(self, typecode)
 
 tests = [] # list to accumulate all tests
-typecodes = "cubBhHiIlLfd"
+typecodes = "cbBhHiIlLfd"
+if test_support.have_unicode:
+    typecodes += "u"
 
 class BadConstructorTest(unittest.TestCase):
 
@@ -837,6 +839,7 @@
         self.assertEqual(s.color, "red")
         self.assertEqual(s.__dict__.keys(), ["color"])
 
+    @test_support.requires_unicode
     def test_nounicode(self):
         a = array.array(self.typecode, self.example)
         self.assertRaises(ValueError, a.fromunicode, unicode(''))

Modules/arraymodule.c

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index c37644d..3ed8a33 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1940,8 +1940,10 @@
 
     if (PyString_Check(typecode) && PyString_GET_SIZE(typecode) == 1)
         c = (unsigned char)*PyString_AS_STRING(typecode);
+#ifdef Py_USING_UNICODE
     else if (PyUnicode_Check(typecode) && PyUnicode_GET_SIZE(typecode) == 1)
         c = *PyUnicode_AS_UNICODE(typecode);
+#endif
     else {
         PyErr_Format(PyExc_TypeError,
                      "array() argument 1 or typecode must be char (string or "