diff options
author | Ralf Gommers <ralf.gommers@googlemail.com> | 2012-03-03 21:20:13 +0100 |
---|---|---|
committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2012-03-03 22:34:02 +0100 |
commit | f4dd54aa614b263950b7a57329eb0ab9a2f2eadf (patch) | |
tree | ef7178a9b7801f42c31290624faf76a1cf5b969c /numpy/core/defchararray.py | |
parent | 91f87e1f613630ff0ad9864017f059afcd6e57f1 (diff) | |
download | numpy-f4dd54aa614b263950b7a57329eb0ab9a2f2eadf.tar.gz |
DOC: merge wiki doc edits.
Diffstat (limited to 'numpy/core/defchararray.py')
-rw-r--r-- | numpy/core/defchararray.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/numpy/core/defchararray.py b/numpy/core/defchararray.py index 850e2dae2..a7b3fd1b7 100644 --- a/numpy/core/defchararray.py +++ b/numpy/core/defchararray.py @@ -265,12 +265,14 @@ def add(x1, x2): Parameters ---------- x1 : array_like of str or unicode + x2 : array_like of str or unicode Returns ------- - out : ndarray + add : ndarray Output array of `string_` or `unicode_`, depending on input types + """ arr1 = numpy.asarray(x1) arr2 = numpy.asarray(x2) @@ -608,14 +610,16 @@ def expandtabs(a, tabsize=8): Return a copy of each string element where all tab characters are replaced by one or more spaces, depending on the current column and the given `tabsize`. The column number is reset to zero after - each newline occurring in the string. If `tabsize` is not given, a - tab size of 8 characters is assumed. This doesn't understand other + each newline occurring in the string. This doesn't understand other non-printing characters or escape sequences. Parameters ---------- a : array_like of str or unicode + Input array tabsize : int, optional + Replace tabs with `tabsize` number of spaces. If not given defaults + to 8 spaces. Returns ------- @@ -625,6 +629,7 @@ def expandtabs(a, tabsize=8): See also -------- str.expandtabs + """ return _to_string_or_unicode_array( _vec_string(a, object_, 'expandtabs', (tabsize,))) |