diff options
Diffstat (limited to 'numpy/add_newdocs.py')
| -rw-r--r-- | numpy/add_newdocs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py index 7175a0e0b..ad18f18c8 100644 --- a/numpy/add_newdocs.py +++ b/numpy/add_newdocs.py @@ -979,8 +979,8 @@ add_newdoc('numpy.core.multiarray', 'fromstring', elements is also ignored. .. deprecated:: 1.14 - If this argument is not provided `fromstring` falls back on the - behaviour of `frombuffer`, after encoding unicode string inputs as + If this argument is not provided, `fromstring` falls back on the + behaviour of `frombuffer` after encoding unicode string inputs as either utf-8 (python 3), or the default encoding (python 2). Returns |