diff options
| author | Matti Picus <matti.picus@gmail.com> | 2020-08-20 15:55:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 15:55:55 +0300 |
| commit | eaa59b4f04a0c75091e332afa95a304eddcd93ab (patch) | |
| tree | 7ae5b7c4b2426b07f3d4a9899be9887d3853bb2e /numpy/f2py/cfuncs.py | |
| parent | 64619c55896dad1927afe78c0702a58abf0d038f (diff) | |
| parent | 434d2f141d7e473040effdba37e29ffd3b75a25c (diff) | |
| download | numpy-eaa59b4f04a0c75091e332afa95a304eddcd93ab.tar.gz | |
Merge pull request #17068 from charris/cleanup-pystring_fromstring-usage
MAINT, BUG: Remove uses of PyString_FromString.
Diffstat (limited to 'numpy/f2py/cfuncs.py')
| -rw-r--r-- | numpy/f2py/cfuncs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py index ccbc9b0fb..9f5c73a45 100644 --- a/numpy/f2py/cfuncs.py +++ b/numpy/f2py/cfuncs.py @@ -320,10 +320,10 @@ cppmacros[ 'pyobj_from_complex_float1'] = '#define pyobj_from_complex_float1(v) (PyComplex_FromDoubles(v.r,v.i))' needs['pyobj_from_string1'] = ['string'] cppmacros[ - 'pyobj_from_string1'] = '#define pyobj_from_string1(v) (PyString_FromString((char *)v))' + 'pyobj_from_string1'] = '#define pyobj_from_string1(v) (PyUnicode_FromString((char *)v))' needs['pyobj_from_string1size'] = ['string'] cppmacros[ - 'pyobj_from_string1size'] = '#define pyobj_from_string1size(v,len) (PyUString_FromStringAndSize((char *)v, len))' + 'pyobj_from_string1size'] = '#define pyobj_from_string1size(v,len) (PyUnicode_FromStringAndSize((char *)v, len))' needs['TRYPYARRAYTEMPLATE'] = ['PRINTPYOBJERR'] cppmacros['TRYPYARRAYTEMPLATE'] = """\ /* New SciPy */ |