diff options
| author | Pearu Peterson <pearu.peterson@gmail.com> | 2021-07-01 17:54:45 +0300 |
|---|---|---|
| committer | Rohit Goswami <rog32@hi.is> | 2022-06-05 15:19:12 +0000 |
| commit | d4e11c7a2eb64861275facb076d47ccd135fa28c (patch) | |
| tree | 307e937f15807094ae81b8a78d791bab4526c851 /numpy/f2py/f90mod_rules.py | |
| parent | e5fcb9d52c1b9d3c9caf067849ad1bba128c7e17 (diff) | |
| download | numpy-d4e11c7a2eb64861275facb076d47ccd135fa28c.tar.gz | |
ENH: Support character string arrays
TST: added test for issue #18684
ENH: f2py opens files with correct encoding, fixes #635
TST: added test for issue #6308
TST: added test for issue #4519
TST: added test for issue #3425
ENH: Implement user-defined hooks support for post-processing f2py data structure. Implement character BC hook.
ENH: Add support for detecting utf-16 and utf-32 encodings.
Diffstat (limited to 'numpy/f2py/f90mod_rules.py')
| -rw-r--r-- | numpy/f2py/f90mod_rules.py | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/numpy/f2py/f90mod_rules.py b/numpy/f2py/f90mod_rules.py index 3e1c9674f..a3bb6a212 100644 --- a/numpy/f2py/f90mod_rules.py +++ b/numpy/f2py/f90mod_rules.py @@ -147,17 +147,9 @@ def buildhooks(pymod): if not dms: dms = '-1' use_fgetdims2 = fgetdims2 - if isstringarray(var): - if 'charselector' in var and 'len' in var['charselector']: - cadd('\t{"%s",%s,{{%s,%s}},%s},' - % (undo_rmbadname1(n), dm['rank'], dms, var['charselector']['len'], at)) - use_fgetdims2 = fgetdims2_sa - else: - cadd('\t{"%s",%s,{{%s}},%s},' % - (undo_rmbadname1(n), dm['rank'], dms, at)) - else: - cadd('\t{"%s",%s,{{%s}},%s},' % - (undo_rmbadname1(n), dm['rank'], dms, at)) + cadd('\t{"%s",%s,{{%s}},%s, %s},' % + (undo_rmbadname1(n), dm['rank'], dms, at, + capi_maps.get_elsize(var))) dadd('\\item[]{{}\\verb@%s@{}}' % (capi_maps.getarrdocsign(n, var))) if hasnote(var): @@ -216,8 +208,10 @@ def buildhooks(pymod): ar['docs'] = [] ar['docshort'] = [] ret = dictappend(ret, ar) - cadd('\t{"%s",-1,{{-1}},0,NULL,(void *)f2py_rout_#modulename#_%s_%s,doc_f2py_rout_#modulename#_%s_%s},' % - (b['name'], m['name'], b['name'], m['name'], b['name'])) + cadd(('\t{"%s",-1,{{-1}},0,0,NULL,(void *)' + 'f2py_rout_#modulename#_%s_%s,' + 'doc_f2py_rout_#modulename#_%s_%s},') + % (b['name'], m['name'], b['name'], m['name'], b['name'])) sargs.append('char *%s' % (b['name'])) sargsp.append('char *') iadd('\tf2py_%s_def[i_f2py++].data = %s;' % |