diff options
| -rw-r--r-- | numpy/core/numeric.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/misc_util.py | 12 | ||||
| -rw-r--r-- | numpy/doc/structured_arrays.py | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index d154206c5..028dfc745 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -2533,7 +2533,7 @@ def seterr(all=None, divide=None, over=None, under=None, invalid=None): Notes ----- - The floating-point exceptions are defined in the IEEE 754 standard [1]: + The floating-point exceptions are defined in the IEEE 754 standard [1]_: - Division by zero: infinite result obtained from finite numbers. - Overflow: result too large to be expressed. diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 1d08942f6..b6d6a06c7 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -1218,15 +1218,15 @@ class Configuration(object): #. file.txt -> (., file.txt)-> parent/file.txt #. foo/file.txt -> (foo, foo/file.txt) -> parent/foo/file.txt #. /foo/bar/file.txt -> (., /foo/bar/file.txt) -> parent/file.txt - #. *.txt -> parent/a.txt, parent/b.txt - #. foo/*.txt -> parent/foo/a.txt, parent/foo/b.txt - #. */*.txt -> (*, */*.txt) -> parent/c/a.txt, parent/d/b.txt + #. \*.txt -> parent/a.txt, parent/b.txt + #. foo/\*.txt -> parent/foo/a.txt, parent/foo/b.txt + #. \*/\*.txt -> (\*, \*/*.txt) -> parent/c/a.txt, parent/d/b.txt #. (sun, file.txt) -> parent/sun/file.txt #. (sun, bar/file.txt) -> parent/sun/file.txt #. (sun, /foo/bar/file.txt) -> parent/sun/file.txt - #. (sun, *.txt) -> parent/sun/a.txt, parent/sun/b.txt - #. (sun, bar/*.txt) -> parent/sun/a.txt, parent/sun/b.txt - #. (sun/*, */*.txt) -> parent/sun/c/a.txt, parent/d/b.txt + #. (sun, \*.txt) -> parent/sun/a.txt, parent/sun/b.txt + #. (sun, bar/\*.txt) -> parent/sun/a.txt, parent/sun/b.txt + #. (sun/\*, \*/\*.txt) -> parent/sun/c/a.txt, parent/d/b.txt An additional feature is that the path to a data-file can actually be a function that takes no arguments and returns the actual path(s) to diff --git a/numpy/doc/structured_arrays.py b/numpy/doc/structured_arrays.py index af02e2173..ba667da59 100644 --- a/numpy/doc/structured_arrays.py +++ b/numpy/doc/structured_arrays.py @@ -284,7 +284,7 @@ the desired underlying dtype, and fields and flags will be copied from ``dtype``. This dtype is similar to a 'union' in C. Indexing and Assignment to Structured arrays -============================================= +============================================ Assigning data to a Structured Array ------------------------------------ @@ -293,7 +293,7 @@ There are a number of ways to assign values to a structured array: Using python tuples, using scalar values, or using other structured arrays. Assignment from Python Native Types (Tuples) -``````````````````````````````````````````` +```````````````````````````````````````````` The simplest way to assign values to a structured array is using python tuples. Each assigned value should be a tuple of length equal to the number of fields |