From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Mon, 2 Dec 2013 00:27:46 +0000 (-0800)
Subject: Issue #19754: Make pickletools.optimize respect the frame size target.
X-Git-Tag: v3.4.0b2~409
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28d271ef6b0eb37e27b5b3234ba146922b11d89f;p=thirdparty%2FPython%2Fcpython.git

Issue #19754: Make pickletools.optimize respect the frame size target.
---

diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index 74b65cea7175..a1c3f1316214 100644
--- a/Lib/pickletools.py
+++ b/Lib/pickletools.py
@@ -2313,6 +2313,7 @@ def optimize(p):
         buf.start_framing()
     for start, stop, putid in opcodes:
         if putid in gets:
+            #buf.commit_frame()
             buf.write(p[start:stop])
     if proto >= 4:
         buf.end_framing()
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index 999eab0d5cbb..d07bc9217770 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1343,12 +1343,6 @@ class AbstractPickleTests(unittest.TestCase):
                 pickled = self.dumps(obj, proto)
                 unpickled = self.loads(pickled)
                 self.assertEqual(obj, unpickled)
-                # Test the framing heuristic is sane,
-                # assuming a given frame size target.
-                if self.optimized:
-                    # These assumptions are currently invalid for optimized
-                    # pickles (see e.g. issue19754).
-                    continue
                 bytes_per_frame = (len(pickled) /
                                    count_opcode(pickle.FRAME, pickled))
                 self.assertGreater(bytes_per_frame,
@@ -1365,12 +1359,7 @@ class AbstractPickleTests(unittest.TestCase):
                 unpickled = self.loads(pickled)
                 self.assertEqual(obj, unpickled)
                 n_frames = count_opcode(pickle.FRAME, pickled)
-                if self.optimized:
-                    # At least one frame was emitted (see issue19754).
-                    self.assertGreaterEqual(n_frames, 1)
-                else:
-                    # At least one frame was emitted per large bytes object.
-                    self.assertGreaterEqual(n_frames, len(obj))
+                self.assertGreaterEqual(n_frames, len(obj))
 
     def test_optional_frames(self):
         if pickle.HIGHEST_PROTOCOL < 4:
diff --git a/Lib/test/test_pickletools.py b/Lib/test/test_pickletools.py
index 029b5b1d51c3..d37ac263c4c1 100644
--- a/Lib/test/test_pickletools.py
+++ b/Lib/test/test_pickletools.py
@@ -6,8 +6,6 @@ from test.pickletester import AbstractPickleModuleTests
 
 class OptimizedPickleTests(AbstractPickleTests, AbstractPickleModuleTests):
 
-    optimized = True
-
     def dumps(self, arg, proto=None):
         return pickletools.optimize(pickle.dumps(arg, proto))