[Python-checkins] cpython (merge default -> default): merge

[christian.heimes]

http://hg.python.org/cpython/rev/4f5dbf26459a
changeset:   87474:4f5dbf26459a
parent:      87473:f8d910b7c330
parent:      87472:895cf5801f4c
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Nov 24 01:12:22 2013 +0100
summary:
  merge

files:
  Lib/test/test__opcode.py |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test__opcode.py b/Lib/test/test__opcode.py
--- a/Lib/test/test__opcode.py
+++ b/Lib/test/test__opcode.py
@@ -1,8 +1,9 @@
 import dis
-import _opcode
-from test.support import run_unittest
+from test.support import run_unittest, import_module
 import unittest
 
+_opcode = import_module("_opcode")
+
 class OpcodeTests(unittest.TestCase):
 
     def test_stack_effect(self):

-- 
Repository URL: http://hg.python.org/cpython