summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2010-05-03 07:50:02 +0000
committerCharles Harris <charlesr.harris@gmail.com>2010-05-03 07:50:02 +0000
commitbc656ee7cb00a6c4ad0d43f1cdd36bf8c9a026ed (patch)
tree43db63bf9d9ad272bb252705de933c8a9ad3940c /numpy/lib
parent82d8d97ac30e20f9ae605df228bee43d89ef72a2 (diff)
downloadnumpy-bc656ee7cb00a6c4ad0d43f1cdd36bf8c9a026ed.tar.gz
ENH, BUG: PyCObject will be deprecated in python 2.7. So use the NpyCapsule
compatibility functions in npy_3kcompat.h to replace the current calls. This gets rid of a number of version checks and is easier to maintain. Fix bug that was present in the ufunc _loop1d_list_free destructor in the python3k case.
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/type_check.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/type_check.py b/numpy/lib/type_check.py
index 05070b3ba..ecc575e89 100644
--- a/numpy/lib/type_check.py
+++ b/numpy/lib/type_check.py
@@ -620,7 +620,7 @@ def datetime_data(dtype):
('events', ctypes.c_int)]
import sys
- if sys.version_info[:2] >= (3,1):
+ if sys.version_info[:2] >= (2,7):
func = ctypes.pythonapi.PyCapsule_GetPointer
func.argtypes = [ctypes.py_object, ctypes.c_char_p]
func.restype = ctypes.c_void_p