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.

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

Jump to bottom

bpo-37502: handle default parameter for buffers argument of pickle.loads #14593

Merged
merged 1 commit into from
Jul 25, 2019
Merged

bpo-37502: handle default parameter for buffers argument of pickle.loads #14593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions Lib/test/pickletester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2765,6 +2765,11 @@ def test_buffers_error(self):
with self.assertRaises(pickle.UnpicklingError):
self.loads(data, buffers=[])

def test_inband_accept_default_buffers_argument(self):
for proto in range(5, pickle.HIGHEST_PROTOCOL + 1):
data_pickled = self.dumps(1, proto, buffer_callback=None)
data = self.loads(data_pickled, buffers=None)

@unittest.skipIf(np is None, "Test needs Numpy")
def test_buffers_numpy(self):
def check_no_copy(x, y):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-07-08-03-15-04.bpo-37502.qZGC4g.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pickle.loads() no longer raises TypeError when the buffers argument is set to None
2 changes: 1 addition & 1 deletion Modules/_pickle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,7 +1653,7 @@ _Unpickler_SetInputEncoding(UnpicklerObject *self,
static int
_Unpickler_SetBuffers(UnpicklerObject *self, PyObject *buffers)
{
if (buffers == NULL) {
if (buffers == NULL || buffers == Py_None) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Propagating down 2 special values meaning "no buffers" is ugly. Can we
normalize the value when we parse the arguments, so the rest of the code
have exactly one value for "no buffers"?

self->buffers = NULL;
}
else {
Expand Down