[h5py] 17/26: Change imports to keep Cython happy, which has new imports on Win/Py2.7

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag 1.3.1
in repository h5py.

commit 8a4ea6fb5fa80fd59ccfb81da6828301b8598019
Author: andrewcollette <andrew.collette at gmail.com>
Date:   Sun Nov 28 19:39:14 2010 +0000

    Change imports to keep Cython happy, which has new imports on Win/Py2.7
---
 h5py/h5e.pyx      | 2 +-
 h5py/h5l_body.pyx | 2 +-
 h5py/h5r.pyx      | 2 +-
 h5py/h5s.pyx      | 2 +-
 h5py/h5t.pyx      | 2 +-
 h5py/utils.pyx    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/h5py/h5e.pyx b/h5py/h5e.pyx
index 4d2b9ab..ce4d554 100644
--- a/h5py/h5e.pyx
+++ b/h5py/h5e.pyx
@@ -17,7 +17,7 @@
 
 include "config.pxi"
 
-from python_exc cimport PyErr_SetString, PyErr_Occurred
+from cpython.exc cimport PyErr_SetString, PyErr_Occurred
 from h5 cimport SmartStruct
 
 import _stub
diff --git a/h5py/h5l_body.pyx b/h5py/h5l_body.pyx
index 3cb1a76..713b22e 100644
--- a/h5py/h5l_body.pyx
+++ b/h5py/h5l_body.pyx
@@ -21,7 +21,7 @@ from h5 cimport init_hdf5, SmartStruct
 from h5p cimport PropID, pdefault
 from h5g cimport GroupID
 from utils cimport emalloc, efree
-from python_exc cimport PyErr_SetString
+from cpython cimport PyErr_SetString
 
 init_hdf5()
 
diff --git a/h5py/h5r.pyx b/h5py/h5r.pyx
index 1e9b0c6..cfe5f0d 100644
--- a/h5py/h5r.pyx
+++ b/h5py/h5r.pyx
@@ -21,7 +21,7 @@ from h5 cimport init_hdf5, ObjectID
 from h5i cimport wrap_identifier
 from h5s cimport SpaceID
 
-from python cimport PyString_FromStringAndSize
+from cpython cimport PyString_FromStringAndSize
 
 # Initialization
 init_hdf5()
diff --git a/h5py/h5s.pyx b/h5py/h5s.pyx
index a2116b0..eb19445 100644
--- a/h5py/h5s.pyx
+++ b/h5py/h5s.pyx
@@ -21,7 +21,7 @@ from h5 cimport init_hdf5
 from utils cimport  require_tuple, convert_dims, convert_tuple, \
                     emalloc, efree, create_numpy_hsize, create_hsize_array
 from numpy cimport ndarray
-from python_string cimport PyString_FromStringAndSize
+from cpython cimport PyString_FromStringAndSize
 
 # Initialization
 init_hdf5()
diff --git a/h5py/h5t.pyx b/h5py/h5t.pyx
index ce40813..9207f2e 100644
--- a/h5py/h5t.pyx
+++ b/h5py/h5t.pyx
@@ -24,7 +24,7 @@ include "config.pxi"
 from h5 cimport init_hdf5, H5PYConfig, get_config
 from h5p cimport PropID, pdefault
 from numpy cimport dtype, ndarray
-from python_string cimport PyString_FromStringAndSize
+from cpython cimport PyString_FromStringAndSize
 from h5r cimport Reference, RegionReference
 
 from utils cimport  emalloc, efree, \
diff --git a/h5py/utils.pyx b/h5py/utils.pyx
index 57f99d0..c82cfff 100644
--- a/h5py/utils.pyx
+++ b/h5py/utils.pyx
@@ -16,7 +16,7 @@ include "config.pxi"
 
 # Compile-time imports
 from h5 cimport init_hdf5
-from python_exc cimport PyErr_SetString
+from cpython cimport PyErr_SetString
 
 from numpy cimport ndarray, import_array, \
                     NPY_UINT16, NPY_UINT32, NPY_UINT64,  npy_intp, \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/h5py.git