diff options
| author | slepton <slepton@posteo.de> | 2021-07-07 21:25:53 +0200 |
|---|---|---|
| committer | slepton <slepton@posteo.de> | 2021-07-07 21:25:53 +0200 |
| commit | d19584547a7934bfce9dee445e65a2c1994cecdc (patch) | |
| tree | 2013779442bff7d9f47464fd3a1b6ba755b0070d /numpy/lib | |
| parent | 5ac75798362cea6ecbd602a46b80c297b0f6712a (diff) | |
| parent | de245cd133699f8c23f97ec07ec29703e37a5923 (diff) | |
| download | numpy-d19584547a7934bfce9dee445e65a2c1994cecdc.tar.gz | |
Merge remote-tracking branch 'origin/main' into main
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/format.py | 2 | ||||
| -rw-r--r-- | numpy/lib/index_tricks.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/numpy/lib/format.py b/numpy/lib/format.py index 9b8f90dbd..6ac66c22a 100644 --- a/numpy/lib/format.py +++ b/numpy/lib/format.py @@ -606,7 +606,7 @@ def _read_array_header(fp, version): if EXPECTED_KEYS != d.keys(): keys = sorted(d.keys()) msg = "Header does not contain the correct keys: {!r}" - raise ValueError(msg.format(d.keys())) + raise ValueError(msg.format(keys)) # Sanity-check the values. if (not isinstance(d['shape'], tuple) or diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index 5140ffa61..8d1b6e5be 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -201,7 +201,6 @@ class nd_grid: length = int(step) if step != 1: step = (key.stop-start)/float(step-1) - stop = key.stop + step return _nx.arange(0, length, 1, float)*step + start else: return _nx.arange(start, stop, step) |