I was targeting head, not the release branches. It is fine to change the exception there as we don't make any guarantee about the exceptions raised during the unpickling process. It is easy enough to fix patch use ValueError for the release branch.

And adding guards is unnecessary after the removing the code for stripping trailing whitespace.

Here's slightly updated patch that check if readline() reached an EOF instead of a newline.