diff options
| author | Jay Bourque <jay.bourque@continuum.io> | 2013-07-08 12:24:24 -0500 |
|---|---|---|
| committer | Jay Bourque <jay.bourque@continuum.io> | 2013-07-08 13:43:31 -0500 |
| commit | 97372dbe877f19ae73a070b05c380cfea0871dc0 (patch) | |
| tree | c1b805d3ace69f7db72061102ff4ee4f972c8b02 | |
| parent | edd989eccb6283bc4cf3605e62ad6733a95316dc (diff) | |
| download | numpy-97372dbe877f19ae73a070b05c380cfea0871dc0.tar.gz | |
STY: Formatting changes
| -rw-r--r-- | numpy/core/src/multiarray/convert_datatype.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/ctors.c | 11 | ||||
| -rw-r--r-- | numpy/core/tests/test_api.py | 18 |
3 files changed, 13 insertions, 18 deletions
diff --git a/numpy/core/src/multiarray/convert_datatype.c b/numpy/core/src/multiarray/convert_datatype.c index f701e49a1..2dae2f88d 100644 --- a/numpy/core/src/multiarray/convert_datatype.c +++ b/numpy/core/src/multiarray/convert_datatype.c @@ -249,7 +249,7 @@ PyArray_AdaptFlexibleDType(PyObject *data_obj, PyArray_Descr *data_dtype, else if (PyArray_Check(data_obj)) { /* * Convert data array to list of objects since - * GetArrayParamsFromObject won't iterator over + * GetArrayParamsFromObject won't iterate over * array. */ list = PyArray_ToList(data_obj); diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c index 4c27c4cec..62e84e699 100644 --- a/numpy/core/src/multiarray/ctors.c +++ b/numpy/core/src/multiarray/ctors.c @@ -532,11 +532,11 @@ discover_itemsize(PyObject *s, int nd, int *itemsize, int size_as_string) if ((nd == 0) || PyString_Check(s) || #if defined(NPY_PY3K) - PyMemoryView_Check(s) || + PyMemoryView_Check(s) || #else - PyBuffer_Check(s) || + PyBuffer_Check(s) || #endif - PyUnicode_Check(s)) { + PyUnicode_Check(s)) { /* If an object has no length, leave it be */ if (size_as_string && s != NULL && !PyString_Check(s)) { @@ -569,7 +569,7 @@ discover_itemsize(PyObject *s, int nd, int *itemsize, int size_as_string) return -1; } - r = discover_itemsize(e,nd-1,itemsize,size_as_string); + r = discover_itemsize(e, nd - 1, itemsize, size_as_string); Py_DECREF(e); if (r == -1) { return -1; @@ -1541,7 +1541,8 @@ PyArray_GetArrayParamsFromObject(PyObject *op, PyTypeNum_ISEXTENDED((*out_dtype)->type_num)) { int itemsize = 0; int size_as_string = 0; - if ((*out_dtype)->type_num == NPY_STRING || (*out_dtype)->type_num == NPY_UNICODE) { + if ((*out_dtype)->type_num == NPY_STRING || + (*out_dtype)->type_num == NPY_UNICODE) { size_as_string = 1; } if (discover_itemsize(op, *out_ndim, &itemsize, size_as_string) < 0) { diff --git a/numpy/core/tests/test_api.py b/numpy/core/tests/test_api.py index 8036210d9..b94f4772e 100644 --- a/numpy/core/tests/test_api.py +++ b/numpy/core/tests/test_api.py @@ -260,25 +260,19 @@ def test_array_astype(): assert_equal(b.dtype, np.dtype('U10')) a = np.array(123456789012345678901234567890, dtype='O').astype('S') - assert_array_equal(a, np.array(b'123456789012345678901234567890', - dtype='S30')) + assert_array_equal(a, np.array(b'1234567890' * 3, dtype='S30')) a = np.array(123456789012345678901234567890, dtype='O').astype('U') - assert_array_equal(a, np.array(sixu('123456789012345678901234567890'), - dtype='U30')) + assert_array_equal(a, np.array(sixu('1234567890' * 3), dtype='U30')) a = np.array([123456789012345678901234567890], dtype='O').astype('S') - assert_array_equal(a, np.array(b'123456789012345678901234567890', - dtype='S30')) + assert_array_equal(a, np.array(b'1234567890' * 3, dtype='S30')) a = np.array([123456789012345678901234567890], dtype='O').astype('U') - assert_array_equal(a, np.array(sixu('123456789012345678901234567890'), - dtype='U30')) + assert_array_equal(a, np.array(sixu('1234567890' * 3), dtype='U30')) a = np.array(123456789012345678901234567890, dtype='S') - assert_array_equal(a, np.array(b'123456789012345678901234567890', - dtype='S30')) + assert_array_equal(a, np.array(b'1234567890' * 3, dtype='S30')) a = np.array(123456789012345678901234567890, dtype='U') - assert_array_equal(a, np.array(sixu('123456789012345678901234567890'), - dtype='U30')) + assert_array_equal(a, np.array(sixu('1234567890' * 3), dtype='U30')) def test_copyto_fromscalar(): |