Merge 7b09039 into 3a3d414

setup.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import array
 import glob
 import os
 import sys
@@ -68,6 +69,12 @@ def run_tests(self):
             "DEF PY2K = " + str(sys.version_info.major == 2) + "\n",
             "DEF PY3K = " + str(sys.version_info.major == 3) + "\n"
         ])
+        if sys.version_info.major < 4:
+            Py_UNICODE_SIZE = array.array('u').itemsize
+            f.writelines([
+                "DEF Py_UNICODE_SIZE = " + str(Py_UNICODE_SIZE) + "\n",
+            ])
+
     with open("src/version.pxi", "w") as f:
         f.writelines([
             "__version__ = " + "\"" + str(version) + "\""

src/cybuffer.pyx

@@ -33,8 +33,6 @@ include "version.pxi"
 
 
 cdef extern from "Python.h":
-    size_t Py_UNICODE_SIZE
-
     object PyMemoryView_FromObject(object obj)
 
 
@@ -162,26 +160,24 @@ cdef class cybuffer(object):
         # Workaround some special cases with the builtin array
         cdef size_t len_nd_b
         cdef int n_1
-        if isinstance(self.obj, array):
+        if (PY2K or PY3K) and isinstance(self.obj, array):
             # Fix-up typecode
             typecode = self.obj.typecode
-            if typecode == "B":
-                return
-            elif PY2K and typecode == "c":
-                self._format = UBYTE_TC
+            if typecode == "B" or (PY2K and typecode == "c"):
                 return
-            elif (PY2K or PY3K) and typecode == "u":
+            elif typecode == "u":
+                if PY2K:
+                    self.itemsize = Py_UNICODE_SIZE
                 if Py_UNICODE_SIZE == 2:
                     self._format = UCS2_TC
                 elif Py_UNICODE_SIZE == 4:
                     self._format = UCS4_TC
             elif PY2K:
+                self.itemsize = self.obj.itemsize
                 self._format = typecode
 
-            # Adjust itemsize, shape, and strides based on casting
+            # Adjust shape and strides based on casting
             if PY2K:
-                self.itemsize = self.obj.itemsize
-
                 len_nd_b = self._buf.ndim * sizeof(Py_ssize_t)
                 self._shape = <Py_ssize_t*>cpython.mem.PyMem_Malloc(len_nd_b)
                 self._strides = <Py_ssize_t*>cpython.mem.PyMem_Malloc(len_nd_b)