diff options
| -rw-r--r-- | numpy/ma/README.txt | 4 | ||||
| -rw-r--r-- | numpy/ma/mrecords.py | 2 | ||||
| -rw-r--r-- | numpy/ma/tests/test_core.py | 12 | ||||
| -rw-r--r-- | numpy/ma/tests/test_mrecords.py | 2 | ||||
| -rw-r--r-- | numpy/ma/tests/test_old_ma.py | 2 | ||||
| -rw-r--r-- | numpy/polynomial/polyutils.py | 4 | ||||
| -rw-r--r-- | numpy/polynomial/tests/test_chebyshev.py | 2 | ||||
| -rw-r--r-- | numpy/polynomial/tests/test_hermite.py | 2 | ||||
| -rw-r--r-- | numpy/polynomial/tests/test_hermite_e.py | 2 | ||||
| -rw-r--r-- | numpy/polynomial/tests/test_laguerre.py | 2 | ||||
| -rw-r--r-- | numpy/polynomial/tests/test_legendre.py | 2 | ||||
| -rw-r--r-- | numpy/polynomial/tests/test_polynomial.py | 2 |
12 files changed, 19 insertions, 19 deletions
diff --git a/numpy/ma/README.txt b/numpy/ma/README.txt index a725b54c3..2e2a803d4 100644 --- a/numpy/ma/README.txt +++ b/numpy/ma/README.txt @@ -63,7 +63,7 @@ Main differences * *put*, *putmask* and *take* now mimic the ndarray methods, to avoid unpleasant surprises. Moreover, *put* and *putmask* both update the mask when needed. * if *a* is a masked array, *bool(a)* raises a *ValueError*, as it does with ndarrays. * in the same way, the comparison of two masked arrays is a masked array, not a boolean * *filled(a)* returns an array of the same subclass as *a._data*, and no test is performed on whether it is contiguous or not. - * the mask is always printed, even if it's *nomask*, which makes things easie (for me at least) to remember that a masked array is used. + * the mask is always printed, even if it's *nomask*, which makes things easy (for me at least) to remember that a masked array is used. * *cumsum* works as if the *_data* array was filled with 0. The mask is preserved, but not updated. * *cumprod* works as if the *_data* array was filled with 1. The mask is preserved, but not updated. @@ -115,7 +115,7 @@ Using maskedarray with matplotlib --------------------------------- Starting with matplotlib 0.91.2, the masked array importing will work with -the the maskedarray branch) as well as with earlier versions. +the maskedarray branch) as well as with earlier versions. By default matplotlib still uses numpy.ma, but there is an rcParams setting that you can use to select maskedarray instead. In the matplotlibrc file diff --git a/numpy/ma/mrecords.py b/numpy/ma/mrecords.py index 382bcc972..6c9a4ea73 100644 --- a/numpy/ma/mrecords.py +++ b/numpy/ma/mrecords.py @@ -776,7 +776,7 @@ def addfield(mrecord, newfield, newfieldname=None): # Create a new empty recarray newdtype = np.dtype(_data.dtype.descr + [(newfieldname, newfield.dtype)]) newdata = recarray(_data.shape, newdtype) - # Add the exisintg field + # Add the existing field [newdata.setfield(_data.getfield(*f), *f) for f in _data.dtype.fields.values()] # Add the new field diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py index b163d3b26..fc8b4bef3 100644 --- a/numpy/ma/tests/test_core.py +++ b/numpy/ma/tests/test_core.py @@ -767,7 +767,7 @@ class TestMaskedArray(TestCase): assert_(str(t_ma[0]) == "([1, --, 3],)") assert_(repr(t_ma[0]) == "([1, --, 3],)") - # additonal tests with structured arrays + # additional tests with structured arrays t_2d = masked_array(data = [([[1, 2], [3,4]],)], mask = [([[False, True], [True, False]],)], @@ -906,7 +906,7 @@ class TestMaskedArrayArithmetic(TestCase): self.assertTrue(minimum(xm, xm).mask) def test_masked_singleton_equality(self): - # Tests (in)equality on masked snigleton + # Tests (in)equality on masked singleton a = array([1, 2, 3], mask=[1, 1, 0]) assert_((a[0] == 0) is masked) assert_((a[0] != 0) is masked) @@ -1803,11 +1803,11 @@ class TestFillingValues(TestCase): y = x.view(np.ndarray) y = x.view(type=np.ndarray) - # Check that fill_value can be overriden with view + # Check that fill_value can be overridden with view y = x.view(MaskedArray, fill_value=2) assert_(y.fill_value == 2) - # Check that fill_value can be overriden with view (using type=) + # Check that fill_value can be overridden with view (using type=) y = x.view(type=MaskedArray, fill_value=2) assert_(y.fill_value == 2) @@ -3899,7 +3899,7 @@ class TestMaskedArrayFunctions(TestCase): def test_flatten_mask(self): # Tests flatten mask - # Standarad dtype + # Standard dtype mask = np.array([0, 0, 1], dtype=np.bool) assert_equal(flatten_mask(mask), mask) # Flexible dtype @@ -3965,7 +3965,7 @@ class TestMaskedArrayFunctions(TestCase): test = np.ma.compressed(M(shape=(0,1,2))) assert_equal(test.ndim, 1) - # with .compessed() overriden + # with .compressed() overridden class M(MaskedArray): def compressed(self): return 42 diff --git a/numpy/ma/tests/test_mrecords.py b/numpy/ma/tests/test_mrecords.py index 574c65271..e97f337f5 100644 --- a/numpy/ma/tests/test_mrecords.py +++ b/numpy/ma/tests/test_mrecords.py @@ -209,7 +209,7 @@ class TestMRecords(TestCase): assert_equal(mbase.a.mask, [0, 0, 1, 1, 0]) assert_equal(mbase.b.mask, [1, 1, 0, 0, 0]) assert_equal(mbase.c.mask, [0, 0, 1, 1, 0]) - # Reinitalizes and redo + # Reinitialize and redo mbase.mask = False mbase.fieldmask = nmask assert_equal(mbase.a.mask, [0, 0, 1, 1, 0]) diff --git a/numpy/ma/tests/test_old_ma.py b/numpy/ma/tests/test_old_ma.py index 6ce29cc03..ed8304d63 100644 --- a/numpy/ma/tests/test_old_ma.py +++ b/numpy/ma/tests/test_old_ma.py @@ -423,7 +423,7 @@ class TestMa(TestCase): assert_(eq(z, [99, 1, 1, 99, 99, 99])) def test_testMinMax2(self): - # Test of minumum, maximum. + # Test of minimum, maximum. assert_(eq(minimum([1, 2, 3], [4, 0, 9]), [1, 0, 3])) assert_(eq(maximum([1, 2, 3], [4, 0, 9]), [4, 2, 9])) x = arange(5) diff --git a/numpy/polynomial/polyutils.py b/numpy/polynomial/polyutils.py index c1b7528d5..5b6663bfd 100644 --- a/numpy/polynomial/polyutils.py +++ b/numpy/polynomial/polyutils.py @@ -1,5 +1,5 @@ """ -Utililty classes and functions for the polynomial modules. +Utility classes and functions for the polynomial modules. This module provides: error and warning objects; a polynomial base class; and some routines used in both the `polynomial` and `chebyshev` modules. @@ -82,7 +82,7 @@ class PolyBase(object): Deprecated in numpy 1.9.0, use the abstract ABCPolyBase class instead. Note that the latter - reguires a number of virtual functions to be + requires a number of virtual functions to be implemented. """ diff --git a/numpy/polynomial/tests/test_chebyshev.py b/numpy/polynomial/tests/test_chebyshev.py index 8d992c4f0..dc0cd14b3 100644 --- a/numpy/polynomial/tests/test_chebyshev.py +++ b/numpy/polynomial/tests/test_chebyshev.py @@ -312,7 +312,7 @@ class TestDerivative(TestCase): assert_raises(ValueError, cheb.chebder, [0], .5) assert_raises(ValueError, cheb.chebder, [0], -1) - # check that zeroth deriviative does nothing + # check that zeroth derivative does nothing for i in range(5): tgt = [0]*i + [1] res = cheb.chebder(tgt, m=0) diff --git a/numpy/polynomial/tests/test_hermite.py b/numpy/polynomial/tests/test_hermite.py index 04da72b26..06ce46ae4 100644 --- a/numpy/polynomial/tests/test_hermite.py +++ b/numpy/polynomial/tests/test_hermite.py @@ -300,7 +300,7 @@ class TestDerivative(TestCase): assert_raises(ValueError, herm.hermder, [0], .5) assert_raises(ValueError, herm.hermder, [0], -1) - # check that zeroth deriviative does nothing + # check that zeroth derivative does nothing for i in range(5): tgt = [0]*i + [1] res = herm.hermder(tgt, m=0) diff --git a/numpy/polynomial/tests/test_hermite_e.py b/numpy/polynomial/tests/test_hermite_e.py index 1162502dc..38da325f6 100644 --- a/numpy/polynomial/tests/test_hermite_e.py +++ b/numpy/polynomial/tests/test_hermite_e.py @@ -300,7 +300,7 @@ class TestDerivative(TestCase): assert_raises(ValueError, herme.hermeder, [0], .5) assert_raises(ValueError, herme.hermeder, [0], -1) - # check that zeroth deriviative does nothing + # check that zeroth derivative does nothing for i in range(5): tgt = [0]*i + [1] res = herme.hermeder(tgt, m=0) diff --git a/numpy/polynomial/tests/test_laguerre.py b/numpy/polynomial/tests/test_laguerre.py index c25476088..0fa76b48a 100644 --- a/numpy/polynomial/tests/test_laguerre.py +++ b/numpy/polynomial/tests/test_laguerre.py @@ -297,7 +297,7 @@ class TestDerivative(TestCase): assert_raises(ValueError, lag.lagder, [0], .5) assert_raises(ValueError, lag.lagder, [0], -1) - # check that zeroth deriviative does nothing + # check that zeroth derivative does nothing for i in range(5): tgt = [0]*i + [1] res = lag.lagder(tgt, m=0) diff --git a/numpy/polynomial/tests/test_legendre.py b/numpy/polynomial/tests/test_legendre.py index 9c259d14c..485bc9688 100644 --- a/numpy/polynomial/tests/test_legendre.py +++ b/numpy/polynomial/tests/test_legendre.py @@ -301,7 +301,7 @@ class TestDerivative(TestCase): assert_raises(ValueError, leg.legder, [0], .5) assert_raises(ValueError, leg.legder, [0], -1) - # check that zeroth deriviative does nothing + # check that zeroth derivative does nothing for i in range(5): tgt = [0]*i + [1] res = leg.legder(tgt, m=0) diff --git a/numpy/polynomial/tests/test_polynomial.py b/numpy/polynomial/tests/test_polynomial.py index 00a52ebce..0e6a2e8a0 100644 --- a/numpy/polynomial/tests/test_polynomial.py +++ b/numpy/polynomial/tests/test_polynomial.py @@ -300,7 +300,7 @@ class TestDerivative(TestCase): assert_raises(ValueError, poly.polyder, [0], .5) assert_raises(ValueError, poly.polyder, [0], -1) - # check that zeroth deriviative does nothing + # check that zeroth derivative does nothing for i in range(5): tgt = [0]*i + [1] res = poly.polyder(tgt, m=0) |