Skip to content
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.

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

[2.7] bpo-31848: Fix broken error handling in Aifc_read.initfp() when the SSND chunk is not found (GH-5240) #5781

Merged
merged 2 commits into from
Feb 21, 2018

Conversation

miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Feb 20, 2018

Initialize self._ssnd_chunk so that aifc.Error is raised as intended,
not AttributeError.
(cherry picked from commit 80d20b9)

Co-authored-by: Zackery Spytz [email protected]

https://bugs.python.org/issue31848

…SND chunk is not found (pythonGH-5240)

Initialize self._ssnd_chunk so that aifc.Error is raised as intended,
not AttributeError.
(cherry picked from commit 80d20b9)

Co-authored-by: Zackery Spytz <[email protected]>
@miss-islington
Copy link
Contributor Author

@ZackerySpytz and @serhiy-storchaka: Backport status check is done, and it's a failure ❌ .

@ZackerySpytz
Copy link
Contributor

The backport to 2.7 needs to use assertRaisesRegexp() instead of assertRaisesRegex().

@serhiy-storchaka serhiy-storchaka dismissed their stale review February 20, 2018 22:11

May need manual editing of the commit message.

@Mariatta
Copy link
Member

@serhiy-storchaka I think miss-islington won't auto merge since you made an additional commit. So you'll have to merge this PR manually. It also failed to report the new status check.

@serhiy-storchaka
Copy link
Member

I dismissed my approve for preventing auto merge because I didn't know how @miss-islington handles the case of multiple commits.

@serhiy-storchaka serhiy-storchaka merged commit b852d8c into python:2.7 Feb 21, 2018
@miss-islington
Copy link
Contributor Author

Thanks, @serhiy-storchaka!

@Mariatta
Copy link
Member

It's not yet handling the multiple commits case :)
I've opened this issue to track it. python/miss-islington#64

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type-bug An unexpected behavior, bug, or error
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants