summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/arrayprint.py3
-rw-r--r--numpy/core/code_generators/generate_umath.py11
-rw-r--r--numpy/core/code_generators/ufunc_docstrings.py8
-rw-r--r--numpy/core/fromnumeric.py1
-rw-r--r--numpy/core/setup_common.py5
5 files changed, 14 insertions, 14 deletions
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py
index 2675b0ea1..6e53dca00 100644
--- a/numpy/core/arrayprint.py
+++ b/numpy/core/arrayprint.py
@@ -399,7 +399,8 @@ def array2string(a, max_line_width=None, precision=None,
Raises
------
- TypeError : if a callable in `formatter` does not return a string.
+ TypeError
+ if a callable in `formatter` does not return a string.
See Also
--------
diff --git a/numpy/core/code_generators/generate_umath.py b/numpy/core/code_generators/generate_umath.py
index 6dd3d4876..ebbf63f20 100644
--- a/numpy/core/code_generators/generate_umath.py
+++ b/numpy/core/code_generators/generate_umath.py
@@ -96,12 +96,11 @@ class Ufunc(object):
Attributes
----------
-
- nin: number of input arguments
- nout: number of output arguments
- identity: identity element for a two-argument function
- docstring: docstring for the ufunc
- type_descriptions: list of TypeDescription objects
+ nin : number of input arguments
+ nout : number of output arguments
+ identity : identity element for a two-argument function
+ docstring : docstring for the ufunc
+ type_descriptions : list of TypeDescription objects
"""
def __init__(self, nin, nout, identity, docstring, typereso,
*type_descriptions):
diff --git a/numpy/core/code_generators/ufunc_docstrings.py b/numpy/core/code_generators/ufunc_docstrings.py
index ff947acb8..b990e81ea 100644
--- a/numpy/core/code_generators/ufunc_docstrings.py
+++ b/numpy/core/code_generators/ufunc_docstrings.py
@@ -2800,7 +2800,7 @@ add_newdoc('numpy.core.umath', 'signbit',
Parameters
----------
- x: array_like
+ x : array_like
The input value(s).
out : ndarray, optional
Array into which the output is placed. Its type is preserved
@@ -2831,9 +2831,9 @@ add_newdoc('numpy.core.umath', 'copysign',
Parameters
----------
- x1: array_like
+ x1 : array_like
Values to change the sign of.
- x2: array_like
+ x2 : array_like
The sign of `x2` is copied to `x1`.
out : ndarray, optional
Array into which the output is placed. Its type is preserved and it
@@ -2896,7 +2896,7 @@ add_newdoc('numpy.core.umath', 'spacing',
Parameters
----------
- x1: array_like
+ x1 : array_like
Values to find the spacing of.
Returns
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index 0080c38ce..e7211cede 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -149,7 +149,6 @@ def reshape(a, newshape, order='C'):
Notes
-----
-
It is not always possible to change the shape of an array without
copying the data. If you want an error to be raise if the data is copied,
you should assign the new shape to the shape attribute of the array::
diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py
index 056cf9ec0..53f3b76e1 100644
--- a/numpy/core/setup_common.py
+++ b/numpy/core/setup_common.py
@@ -163,13 +163,14 @@ def pyod(filename):
Parameters
----------
- filename: str
+ filename : str
name of the file to get the dump from.
Returns
-------
- out: seq
+ out : seq
list of lines of od output
+
Note
----
We only implement enough to get the necessary information for long double