diff options
| author | mattip <matti.picus@gmail.com> | 2023-05-11 00:21:51 +0300 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2023-05-11 00:22:09 +0300 |
| commit | 5e983f22c3d554377b0541ff46507001123addca (patch) | |
| tree | c47ad7bf712c0dcffc7adb6e3a4947da84465907 | |
| parent | 670842b38005febf64259f268332e46d86233ef0 (diff) | |
| download | numpy-5e983f22c3d554377b0541ff46507001123addca.tar.gz | |
BUG: typo, linting
| -rw-r--r-- | benchmarks/benchmarks/bench_scalar.py | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/scalartypes.c.src | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_arrayprint.py | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/benchmarks/benchmarks/bench_scalar.py b/benchmarks/benchmarks/bench_scalar.py index d68f934cb..638f66df5 100644 --- a/benchmarks/benchmarks/bench_scalar.py +++ b/benchmarks/benchmarks/bench_scalar.py @@ -66,10 +66,12 @@ class ScalarMath(Benchmark): other + int32 other + int32 + class ScalarStr(Benchmark): # Test scalar to str conversion params = [TYPES1] param_names = ["type"] + def setup(self, typename): self.a = np.array([100] * 100, dtype=typename) diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src index dee9d43c5..ff30737b5 100644 --- a/numpy/core/src/multiarray/scalartypes.c.src +++ b/numpy/core/src/multiarray/scalartypes.c.src @@ -298,7 +298,7 @@ genint_type_str(PyObject *self) item = PyLong_FromLong(*(int32_t *)val); break; case NPY_UINT: - item = PyLong_FromUnsignedLong(*(int32_t *)val); + item = PyLong_FromUnsignedLong(*(uint32_t *)val); break; case NPY_LONG: item = PyLong_FromLong(*(int64_t *)val); diff --git a/numpy/core/tests/test_arrayprint.py b/numpy/core/tests/test_arrayprint.py index fc8b0b2db..6796b4077 100644 --- a/numpy/core/tests/test_arrayprint.py +++ b/numpy/core/tests/test_arrayprint.py @@ -258,7 +258,6 @@ class TestArray2String: assert_(np.array2string(s, formatter={'numpystr':lambda s: s*2}) == '[abcabc defdef]') - def test_structure_format_mixed(self): dt = np.dtype([('name', np.str_, 16), ('grades', np.float64, (2,))]) x = np.array([('Sarah', (8.0, 7.0)), ('John', (6.0, 7.0))], dtype=dt) |