[Numpy-svn] r8381 - trunk/numpy/lib

[numpy-svn at scipy.org]

Author: charris
Date: 2010-05-04 01:24:07 -0500 (Tue, 04 May 2010)
New Revision: 8381

Modified:
   trunk/numpy/lib/type_check.py
Log:
BUG: Fix datetime_data for python versions >= 2.7.

Modified: trunk/numpy/lib/type_check.py
===================================================================
--- trunk/numpy/lib/type_check.py	2010-05-04 06:24:05 UTC (rev 8380)
+++ trunk/numpy/lib/type_check.py	2010-05-04 06:24:07 UTC (rev 8381)
@@ -638,7 +638,10 @@
     # FIXME: This needs to be kept consistent with enum in ndarrayobject.h
     from numpy.core.multiarray import DATETIMEUNITS
     obj = ctypes.py_object(DATETIMEUNITS)
-    result = func(obj)
+    if sys.version_info[:2] >= (2,7):
+        result = func(obj, ctypes.c_char_p(None))
+    else:
+        result = func(obj)
     _unitnum2name = ctypes.cast(ctypes.c_void_p(result), ctypes.POINTER(ctypes.c_char_p))
 
     return (_unitnum2name[base], struct.num, struct.den, struct.events)