Merge pull request #1596 from quantopian/cxx-fixes

C++ fixes

Cython/Build/IpythonMagic.py

@@ -257,7 +257,7 @@ class CythonMagics(Magics):
 
         if need_cythonize:
             c_include_dirs = args.include
-            c_src_files = map(str, args.src)
+            c_src_files = list(map(str, args.src))
             if 'numpy' in code:
                 import numpy
                 c_include_dirs.append(numpy.get_include())

Cython/Compiler/PyrexTypes.py

@@ -4102,7 +4102,7 @@ def best_match(arg_types, functions, pos=None, env=None, args=None):
                 [pattern.type.deduce_template_params(actual) for (pattern, actual) in zip(func_type.args, arg_types)],
                 {})
             if deductions is None:
-                errors.append((func, "Unable to deduce type parameters for %s given %s" % (pattern.type, actual)))
+                errors.append((func, "Unable to deduce type parameters for %s given (%s)" % (func_type, ', '.join(map(str, arg_types)))))
             elif len(deductions) < len(func_type.templates):
                 errors.append((func, "Unable to deduce type parameter %s" % (
                     ", ".join([param.name for param in set(func_type.templates) - set(deductions.keys())]))))