summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/function_base.py5
-rw-r--r--numpy/lib/recfunctions.py13
2 files changed, 9 insertions, 9 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index a6e3e07d3..70aa654dc 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -109,9 +109,8 @@ def rot90(m, k=1, axes=(0,1)):
>>> np.rot90(m, 1, (1,2))
array([[[1, 3],
[0, 2]],
-
- [[5, 7],
- [4, 6]]])
+ [[5, 7],
+ [4, 6]]])
"""
axes = tuple(axes)
diff --git a/numpy/lib/recfunctions.py b/numpy/lib/recfunctions.py
index e9ba38f46..c455bd93f 100644
--- a/numpy/lib/recfunctions.py
+++ b/numpy/lib/recfunctions.py
@@ -397,12 +397,13 @@ def merge_arrays(seqarrays, fill_value=-1, flatten=False,
Notes
-----
* Without a mask, the missing value will be filled with something,
- * depending on what its corresponding type:
- -1 for integers
- -1.0 for floating point numbers
- '-' for characters
- '-1' for strings
- True for boolean values
+ depending on what its corresponding type:
+
+ * ``-1`` for integers
+ * ``-1.0`` for floating point numbers
+ * ``'-'`` for characters
+ * ``'-1'`` for strings
+ * ``True`` for boolean values
* XXX: I just obtained these values empirically
"""
# Only one item in the input sequence ?