Skip to content

gh-102542 Remove unused bytes object and bytes slicing #106433

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
merged 2 commits into from
Jul 5, 2023
Merged

gh-102542 Remove unused bytes object and bytes slicing #106433

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b48a1fa
Remove unused bytes object and bytes slicing
JosephSBoyle Jul 4, 2023
7775a83
Merge branch 'main' into refactor-MIME-audio
hauntsaninja Jul 5, 2023
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
11 changes: 4 additions & 7 deletions Lib/email/mime/audio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

__all__ = ['MIMEAudio']

from io import BytesIO
from email import encoders
from email.mime.nonmultipart import MIMENonMultipart

Expand Down Expand Up @@ -59,10 +58,8 @@ def _what(data):
# sndhdr.what() had a pretty cruddy interface, unfortunately. This is why
# we re-do it here. It would be easier to reverse engineer the Unix 'file'
# command and use the standard 'magic' file, as shipped with a modern Unix.
hdr = data[:512]
fakefile = BytesIO(hdr)
for testfn in _rules:
if res := testfn(hdr, fakefile):
if res := testfn(data):
return res
else:
return None
Expand All @@ -74,7 +71,7 @@ def rule(rulefunc):


@rule
def _aiff(h, f):
def _aiff(h):
if not h.startswith(b'FORM'):
return None
if h[8:12] in {b'AIFC', b'AIFF'}:
Expand All @@ -84,15 +81,15 @@ def _aiff(h, f):


@rule
def _au(h, f):
def _au(h):
if h.startswith(b'.snd'):
return 'basic'
else:
return None


@rule
def _wav(h, f):
def _wav(h):
# 'RIFF' <len> 'WAVE' 'fmt ' <len>
if not h.startswith(b'RIFF') or h[8:12] != b'WAVE' or h[12:16] != b'fmt ':
return None
Expand Down