[pypy-commit] pypy py3.5: fix bad merge

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r87647:c9676f35333a
Date: 2016-10-09 02:58 +0100
http://bitbucket.org/pypy/pypy/changeset/c9676f35333a/

Log:	fix bad merge

diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -6,7 +6,8 @@
 
 from rpython.rlib import jit, rstackovf, rstring
 from rpython.rlib.debug import check_nonneg
-(??)from rpython.rlib.objectmodel import we_are_translated
+from rpython.rlib.objectmodel import (
+    we_are_translated, always_inline, dont_inline)
 from rpython.rlib.rarithmetic import r_uint, intmask
 from rpython.tool.sourcetools import func_with_new_name
 
@@ -1466,7 +1467,7 @@
                           next_instr + offsettoend, self.lastblock)
         self.lastblock = block
         self.pushvalue(res)
-    
+
     def BEFORE_ASYNC_WITH(self, oparg, next_instr):
         space = self.space
         w_manager = self.peekvalue()