From 20ab4cdaff4419cf1e00b3d8d802623e03ad571c Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Sun, 7 Nov 2010 01:12:54 +0200 Subject: [PATCH] ENH: Update Cython imports. --- scikits/image/graph/heap.pyx | 2 +- scikits/image/opencv/opencv_backend.pyx | 2 +- scikits/image/opencv/opencv_cv.pyx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scikits/image/graph/heap.pyx b/scikits/image/graph/heap.pyx index 272fa15b..2345f2f9 100644 --- a/scikits/image/graph/heap.pyx +++ b/scikits/image/graph/heap.pyx @@ -35,7 +35,7 @@ from __future__ import division # cython specific imports import cython -from stdlib cimport malloc, free +from libc.stdlib cimport malloc, free cdef extern from "pyport.h": double Py_HUGE_VAL diff --git a/scikits/image/opencv/opencv_backend.pyx b/scikits/image/opencv/opencv_backend.pyx index 4f9cbd6d..dd45a56a 100644 --- a/scikits/image/opencv/opencv_backend.pyx +++ b/scikits/image/opencv/opencv_backend.pyx @@ -1,7 +1,7 @@ import ctypes import numpy as np cimport numpy as np -from python cimport * +from cpython cimport * from opencv_constants import * from opencv_type cimport * from _libimport import cv, cxcore diff --git a/scikits/image/opencv/opencv_cv.pyx b/scikits/image/opencv/opencv_cv.pyx index 4448716c..c728eeb7 100644 --- a/scikits/image/opencv/opencv_cv.pyx +++ b/scikits/image/opencv/opencv_cv.pyx @@ -5,8 +5,8 @@ import ctypes cimport numpy as np import numpy as np -from python cimport * -from stdlib cimport * +from cpython cimport * +from libc.stdlib cimport * from opencv_type cimport * from opencv_backend import * from opencv_backend cimport *