[pypy-commit] pypy vmprof: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: vmprof
Changeset: r76687:dc181afb0e0e
Date: 2015-04-02 15:18 +0200
http://bitbucket.org/pypy/pypy/changeset/dc181afb0e0e/

Log:	merge

diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1,8 +1,8 @@
-import sys, os
+import sys
 
 from rpython.rlib.cache import Cache
 from rpython.tool.uid import HUGEVAL_BYTES
-from rpython.rlib import jit, types, rfile
+from rpython.rlib import jit, types
 from rpython.rlib.debug import make_sure_not_resized
 from rpython.rlib.objectmodel import (we_are_translated, newlist_hint,
      compute_unique_id, specialize)
diff --git a/pypy/module/__pypy__/interp_magic.py b/pypy/module/__pypy__/interp_magic.py
--- a/pypy/module/__pypy__/interp_magic.py
+++ b/pypy/module/__pypy__/interp_magic.py
@@ -130,4 +130,3 @@
 def locals_to_fast(space, w_frame):
     assert isinstance(w_frame, PyFrame)
     w_frame.locals2fast()
-
diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -181,9 +181,8 @@
         if self.fileno == -1:
             raise OperationError(space.w_RuntimeError,
                                  space.wrap("vmprof not running"))
-        if len(self.current_codes) < MAX_CODES:
-            self.current_codes.append(code)
-        else:
+        self.current_codes.append(code)
+        if len(self.current_codes) >= MAX_CODES:
             self._flush_codes(space)
 
     def _flush_codes(self, space):