python
diff --git a/‎Lib/test/pickletester.py‎
Lines changed: 18 additions & 17 deletions b/‎Lib/test/pickletester.py‎
Lines changed: 18 additions & 17 deletions
diff --git a/‎Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst‎
Lines changed: 1 addition & 0 deletions b/‎Misc/NEWS.d/next/Library/2018-04-03-10-37-13.bpo-33209.9sGWE_.rst‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Modules/_pickle.c‎
Lines changed: 3 additions & 2 deletions b/‎Modules/_pickle.c‎
Lines changed: 3 additions & 2 deletions
@@ -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.
 
@@ -0,0 +1 @@
+End framing at the end of C implementation of :func:`pickle.Pickler.dump`.
@@ -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;
 }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+End framing at the end of C implementation of :func:`pickle.Pickler.dump`.
Original file line number	Diff line number	Diff line change
`@@ -4152,9 +4152,10 @@ dump(PicklerObject self, PyObject obj)`
`4152`	`4152`	`}`
`4153`	`4153`
`4154`	`4154`	`if (save(self, obj, 0) < 0 \|\|`
`4155`		`- _Pickler_Write(self, &stop_op, 1) < 0)`
	`4155`	`+ _Pickler_Write(self, &stop_op, 1) < 0 \|\|`
	`4156`	`+ _Pickler_CommitFrame(self) < 0)`
`4156`	`4157`	`return -1;`
`4157`		`-`
	`4158`	`+ self->framing = 0;`
`4158`	`4159`	`return 0;`
`4159`	`4160`	`}`
`4160`	`4161`