diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-02-20 10:06:56 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-02-20 10:06:56 -0700 |
| commit | d54b6784501de8aef405794f20cf1f4b3941c68f (patch) | |
| tree | 1e97b84e3c066c139707a2495449f5af1e5fe58e /numpy/f2py/cfuncs.py | |
| parent | 0178b12f3cd9804df066d0045a75180177962831 (diff) | |
| parent | ddcb49e5f779a9e42356914b9ec4162b722d4ab0 (diff) | |
| download | numpy-d54b6784501de8aef405794f20cf1f4b3941c68f.tar.gz | |
Merge pull request #4305 from charris/fix-gh-4256
BUG: #4256: f2py, PyString_FromStringAndSize is undefined in Python3.
Diffstat (limited to 'numpy/f2py/cfuncs.py')
| -rw-r--r-- | numpy/f2py/cfuncs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index 287192db2..7fb630697 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -312,7 +312,7 @@ cppmacros['pyobj_from_complex_float1']='#define pyobj_from_complex_float1(v) (Py needs['pyobj_from_string1']=['string'] cppmacros['pyobj_from_string1']='#define pyobj_from_string1(v) (PyString_FromString((char *)v))' needs['pyobj_from_string1size']=['string'] -cppmacros['pyobj_from_string1size']='#define pyobj_from_string1size(v,len) (PyString_FromStringAndSize((char *)v, len))' +cppmacros['pyobj_from_string1size']='#define pyobj_from_string1size(v,len) (PyUString_FromStringAndSize((char *)v, len))' needs['TRYPYARRAYTEMPLATE']=['PRINTPYOBJERR'] cppmacros['TRYPYARRAYTEMPLATE']="""\ /* New SciPy */ |