Include pyximport in testrunner for py3k and fix py3k unicode fused bug

Cython/Compiler/Code.py

@@ -1948,11 +1948,11 @@ class PyxCodeWriter(object):
     to load the code to support python 2.4
     """
 
-    def __init__(self, buffer=None, indent_level=0, context=None):
+    def __init__(self, buffer=None, indent_level=0, context=None, encoding='ascii'):
         self.buffer = buffer or StringIOTree()
         self.level = indent_level
         self.context = context
-        self.encoding = 'ascii'
+        self.encoding = encoding
 
     def indent(self, levels=1):
         self.level += levels
@@ -1969,7 +1969,11 @@ class PyxCodeWriter(object):
         return self
 
     def getvalue(self):
-        return unicode(self.buffer.getvalue(), self.encoding)
+        result = self.buffer.getvalue()
+        if not isinstance(result, unicode):
+            result = result.decode(self.encoding)
+
+        return result
 
     def putln(self, line, context=None):
         context = context or self.context

Cython/Compiler/FusedNode.py

+from __future__ import with_statement
+
 import copy
 
 from Cython.Compiler import (ExprNodes, PyrexTypes, MemoryView,
@@ -605,8 +607,7 @@ class FusedCFuncDefNode(StatListNode):
         fragment_code = pyx_code.getvalue()
         # print decl_code.getvalue()
         # print fragment_code
-        fragment = TreeFragment.TreeFragment(fragment_code.decode('ascii'),
-                                             level='module')
+        fragment = TreeFragment.TreeFragment(fragment_code, level='module')
         ast = TreeFragment.SetPosTransform(self.node.pos)(fragment.root)
         UtilityCode.declare_declarations_in_scope(decl_code.getvalue(), env)
         ast.scope = env

Cython/Compiler/Importer.py

@@ -40,7 +40,7 @@ def importer(modulename, compile=False, version=None):
     Otherwise, try a regular import and if that fails (i.e. there is a
     syntax error, try to compile it.
     """
-    if version is not None and sys.version_info[:2] >= version:
+    if version is not None and sys.version_info[:2] >= version and not compile:
         return _import_normal(modulename)
 
     if compile:

Cython/Compiler/ParseTreeTransforms.py

@@ -1489,7 +1489,8 @@ if VALUE is not None:
 
                 return node
 
-            FusedNode = Importer.importer("Cython.Compiler.FusedNode", version=(2, 5))
+            FusedNode = Importer.importer("Cython.Compiler.FusedNode",
+                                          version=(2, 5))
             node = FusedNode.FusedCFuncDefNode(node, env)
 
             self.fused_function = node

runtests.py

@@ -1251,6 +1251,8 @@ def refactor_for_py3(distdir, cy3_dir):
                      recursive-include Cython *.py *.pyx *.pxd
                      recursive-include Cython/Debugger/Tests *
                      recursive-include Cython/Utility *
+                     recursive-exclude pyximport test
+                     include pyximport/*.py
                      include runtests.py
                      include cython.py
                      ''')