Skip to content

Commit 83cd89b

Browse files
authored
Merge pull request numpy#27255 from ngoldbaum/fix-printoptions
BUG: revert unintended change in the return value of set_printoptions
2 parents b96fe07 + 41a1dde commit 83cd89b

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

numpy/_core/arrayprint.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,15 @@ def set_printoptions(precision=None, threshold=None, edgeitems=None,
280280
array([ 0. , 1.11, 2.22, ..., 7.78, 8.89, 10. ])
281281
282282
"""
283+
_set_printoptions(precision, threshold, edgeitems, linewidth, suppress,
284+
nanstr, infstr, formatter, sign, floatmode,
285+
legacy=legacy, override_repr=override_repr)
286+
287+
288+
def _set_printoptions(precision=None, threshold=None, edgeitems=None,
289+
linewidth=None, suppress=None, nanstr=None,
290+
infstr=None, formatter=None, sign=None, floatmode=None,
291+
*, legacy=None, override_repr=None):
283292
new_opt = _make_options_dict(precision, threshold, edgeitems, linewidth,
284293
suppress, nanstr, infstr, sign, formatter,
285294
floatmode, legacy)
@@ -293,8 +302,7 @@ def set_printoptions(precision=None, threshold=None, edgeitems=None,
293302
if updated_opt['legacy'] == 113:
294303
updated_opt['sign'] = '-'
295304

296-
token = format_options.set(updated_opt)
297-
return token
305+
return format_options.set(updated_opt)
298306

299307

300308
@set_module('numpy')
@@ -378,8 +386,9 @@ def printoptions(*args, **kwargs):
378386
--------
379387
set_printoptions, get_printoptions
380388
381-
"""
382-
token = set_printoptions(*args, **kwargs)
389+
"""
390+
token = _set_printoptions(*args, **kwargs)
391+
383392
try:
384393
yield get_printoptions()
385394
finally:

numpy/_core/tests/test_arrayprint.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,9 @@ def teardown_method(self):
627627
def test_basic(self):
628628
x = np.array([1.5, 0, 1.234567890])
629629
assert_equal(repr(x), "array([1.5 , 0. , 1.23456789])")
630-
np.set_printoptions(precision=4)
630+
ret = np.set_printoptions(precision=4)
631631
assert_equal(repr(x), "array([1.5 , 0. , 1.2346])")
632+
assert ret is None
632633

633634
def test_precision_zero(self):
634635
np.set_printoptions(precision=0)

0 commit comments

Comments
 (0)