Test exceptions

Author: sklam

pandas/computation/expr.py

@@ -546,7 +546,7 @@ def visit_Call(self, node, side=None, **kwargs):
                 args += self.visit(node.starargs)
 
             if node.keywords or node.kwargs:
-                raise TypeError("Function {0} does not support keyword "
+                raise TypeError("Function \"{0}\" does not support keyword "
                                 "arguments".format(res.name))
 
             return res(*args, **kwargs)

pandas/computation/ops.py

@@ -520,7 +520,7 @@ def __unicode__(self):
 class FuncNode(object):
     def __init__(self, name):
         if name not in _mathops:
-            raise ValueError("{0} is not a supported function".format(name))
+            raise ValueError("\"{0}\" is not a supported function".format(name))
         self.name = name
         self.func = getattr(np, name)
 

pandas/computation/tests/test_eval.py

@@ -1521,11 +1521,22 @@ def test_result_types(self):
 
     def test_undefined_func(self):
         df = DataFrame({'a': np.random.randn(10)})
-        with tm.assertRaises(ValueError):
+        with tm.assertRaisesRegexp(ValueError,
+                                   "\"mysin\" is not a supported function"):
             df.eval("mysin(a)",
                     engine=self.engine,
                     parser=self.parser)
 
+    def test_keyword_arg(self):
+        df = DataFrame({'a': np.random.randn(10)})
+        with tm.assertRaisesRegexp(TypeError,
+                                   "Function \"sin\" does not support "
+                                   "keyword arguments"):
+            df.eval("sin(x=a)",
+                    engine=self.engine,
+                    parser=self.parser)
+
+
 class TestMathPythonPandas(TestMathPythonPython):
     @classmethod
     def setUpClass(cls):