Skip to content

bpo-42222: Modernize integer test/conversion in randrange() #23064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhettinger merged 9 commits into from
Dec 28, 2020
Merged

bpo-42222: Modernize integer test/conversion in randrange() #23064

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e11b1dc
Use index() instead of testing int(x)==x
rhettinger Oct 31, 2020
ebe8391
Add blurb
rhettinger Oct 31, 2020
ed2f6fd
Deprecate float arguments and the ValueError
rhettinger Oct 31, 2020
ab9aeb7
Add more detail to blurb
rhettinger Dec 24, 2020
f32d175
Add tests
rhettinger Dec 24, 2020
ebcb257
Update the docs
rhettinger Dec 24, 2020
832d885
Improve blurb
rhettinger Dec 24, 2020
9e6945d
Cover the case with a unit step
rhettinger Dec 24, 2020
85cc9ee
More concise blurb
rhettinger Dec 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cover the case with a unit step
  • Loading branch information
@rhettinger
rhettinger committed Dec 24, 2020
commit 9e6945d9d2a361c3ce947490823fab114ce96b81
13 changes: 7 additions & 6 deletions Lib/random.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,7 @@ def randrange(self, start, stop=None, step=1):
_warn('randrange() will raise TypeError in the future',
DeprecationWarning, 2)
raise ValueError("non-integer stop for randrange()")
width = istop - istart
if step == 1 and width > 0:
return istart + self._randbelow(width)
if step == 1:
raise ValueError("empty range for randrange() (%d, %d, %d)" % (istart, istop, width))

# Non-unit step argument supplied.
try:
istep = _index(step)
except TypeError:
Expand All @@ -350,6 +344,13 @@ def randrange(self, start, stop=None, step=1):
_warn('randrange() will raise TypeError in the future',
DeprecationWarning, 2)
raise ValueError("non-integer step for randrange()")
width = istop - istart
if istep == 1 and width > 0:
return istart + self._randbelow(width)
if istep == 1:
raise ValueError("empty range for randrange() (%d, %d, %d)" % (istart, istop, width))

# Non-unit step argument supplied.
if istep > 0:
n = (width + istep - 1) // istep
elif istep < 0:
Expand Down
2 changes: 2 additions & 0 deletions Lib/test/test_random.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,8 @@ def test_randrange_argument_handling(self):
randrange(10.0, 20, 2)
with self.assertWarns(DeprecationWarning):
randrange(10, 20.0, 2)
with self.assertWarns(DeprecationWarning):
randrange(10, 20, 1.0)
with self.assertWarns(DeprecationWarning):
randrange(10, 20, 2.0)
with self.assertWarns(DeprecationWarning):
Expand Down