diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-02-16 15:07:25 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-02-16 15:07:25 -0700 |
| commit | ddcb49e5f779a9e42356914b9ec4162b722d4ab0 (patch) | |
| tree | c60ddd79ccbeec804ec839ede1ab9858de404f2b /numpy/f2py/src/fortranobject.h | |
| parent | 2868dc4a0513f58eafc013f3ba3d84ae07113199 (diff) | |
| download | numpy-ddcb49e5f779a9e42356914b9ec4162b722d4ab0.tar.gz | |
BUG: #4256: f2py, PyString_FromStringAndSize is undefined in Python3.
Use PyUString_FromStringAndSize defined in npy_3kcompat instead. Not
using bytes may cause some problems, but strings seem like a better
choice. As modules generated with current f2py error out, this
particular use is not common and we are free to choose.
Closes #4256.
Diffstat (limited to 'numpy/f2py/src/fortranobject.h')
| -rw-r--r-- | numpy/f2py/src/fortranobject.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/numpy/f2py/src/fortranobject.h b/numpy/f2py/src/fortranobject.h index 76a357b5e..689f78c92 100644 --- a/numpy/f2py/src/fortranobject.h +++ b/numpy/f2py/src/fortranobject.h @@ -20,6 +20,7 @@ extern "C" { #define PyString_GET_SIZE PyBytes_GET_SIZE #define PyString_AS_STRING PyBytes_AS_STRING #define PyString_FromString PyBytes_FromString +#define PyUString_FromStringAndSize PyUnicode_FromStringAndSize #define PyString_ConcatAndDel PyBytes_ConcatAndDel #define PyString_AsString PyBytes_AsString @@ -29,6 +30,10 @@ extern "C" { #define PyInt_AsLong PyLong_AsLong #define PyNumber_Int PyNumber_Long + +#else + +#define PyUString_FromStringAndSize PyString_FromStringAndSize #endif |