FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-144975: Fix wave.Wave_write.setframerate() validation order by mbeijen · Pull Request #144976 · python/cpython · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
37 changes: 37 additions & 0 deletions Lib/test/test_wave.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,43 @@ def test_open_in_write_raises(self):
support.gc_collect()
self.assertIsNone(cm.unraisable)

@support.subTests('arg', (
# rounds to 0, should raise:
0.5,
0.4,
# Negative values should still raise:
-1,
-0.5,
-0.4,
# 0 should raise:
0,
))
def test_setframerate_validates_rounded_values(self, arg):
"""Test that setframerate that round to 0 or negative are rejected"""
with wave.open(io.BytesIO(), 'wb') as f:
f.setnchannels(1)
f.setsampwidth(2)
with self.assertRaises(wave.Error):
f.setframerate(arg)
with self.assertRaises(wave.Error):
f.close()

@support.subTests(('arg', 'expected'), (
(1.4, 1),
(1.5, 2),
(1.6, 2),
(44100.4, 44100),
(44100.5, 44100),
(44100.6, 44101),
))
def test_setframerate_rounds(self, arg, expected):
"""Test that setframerate is rounded"""
with wave.open(io.BytesIO(), 'wb') as f:
f.setnchannels(1)
f.setsampwidth(2)
f.setframerate(arg)
self.assertEqual(f.getframerate(), expected)


class WaveOpen(unittest.TestCase):
def test_open_pathlike(self):
Expand Down
3 changes: 2 additions & 1 deletion Lib/wave.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -493,9 +493,10 @@ def getsampwidth(self):
def setframerate(self, framerate):
if self._datawritten:
raise Error('cannot change parameters after starting to write')
framerate = int(round(framerate))
if framerate <= 0:
raise Error('bad frame rate')
self._framerate = int(round(framerate))
self._framerate = framerate

def getframerate(self):
if not self._framerate:
Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:meth:`wave.Wave_write.setframerate` now validates the frame rate after
rounding to an integer, preventing values like ``0.5`` from being accepted
and causing confusing errors later. Patch by Michiel Beijen.
Loading

Back | FazBrowse Home | New Git URL