Skip to content

[3.7] bpo-33209: End framing at the end of C implementation of pickle.Pickler.dump(). (GH-6363) #6366

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
ambv merged 1 commit into from
Apr 3, 2018
Merged

[3.7] bpo-33209: End framing at the end of C implementation of pickle.Pickler.dump(). (GH-6363) #6366

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
35 changes: 18 additions & 17 deletions Lib/test/pickletester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2781,29 +2781,30 @@ def test_clear_pickler_memo(self):
# object again, the third serialized form should be identical to the
# first one we obtained.
data = ["abcdefg", "abcdefg", 44]
f = io.BytesIO()
pickler = self.pickler_class(f)
for proto in protocols:
f = io.BytesIO()
pickler = self.pickler_class(f, proto)

pickler.dump(data)
first_pickled = f.getvalue()
pickler.dump(data)
first_pickled = f.getvalue()

# Reset BytesIO object.
f.seek(0)
f.truncate()
# Reset BytesIO object.
f.seek(0)
f.truncate()

pickler.dump(data)
second_pickled = f.getvalue()
pickler.dump(data)
second_pickled = f.getvalue()

# Reset the Pickler and BytesIO objects.
pickler.clear_memo()
f.seek(0)
f.truncate()
# Reset the Pickler and BytesIO objects.
pickler.clear_memo()
f.seek(0)
f.truncate()

pickler.dump(data)
third_pickled = f.getvalue()
pickler.dump(data)
third_pickled = f.getvalue()

self.assertNotEqual(first_pickled, second_pickled)
self.assertEqual(first_pickled, third_pickled)
self.assertNotEqual(first_pickled, second_pickled)
self.assertEqual(first_pickled, third_pickled)

def test_priming_pickler_memo(self):
# Verify that we can set the Pickler's memo attribute.
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
End framing at the end of C implementation of :func:`pickle.Pickler.dump`.
5 changes: 3 additions & 2 deletions Modules/_pickle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4152,9 +4152,10 @@ dump(PicklerObject *self, PyObject *obj)
}

if (save(self, obj, 0) < 0 ||
_Pickler_Write(self, &stop_op, 1) < 0)
_Pickler_Write(self, &stop_op, 1) < 0 ||
_Pickler_CommitFrame(self) < 0)
return -1;

self->framing = 0;
return 0;
}

Expand Down