Blob Blame History Raw
diff -ur patsy-0.2.1/patsy/test_highlevel.py patsy-0.2.1.nopandas/patsy/test_highlevel.py
--- patsy-0.2.1/patsy/test_highlevel.py	2014-01-09 22:45:10.795234808 +0100
+++ patsy-0.2.1.nopandas/patsy/test_highlevel.py	2014-01-09 22:46:42.958974829 +0100
@@ -645,7 +645,12 @@
 def test_dmatrix_NA_action():
     data = {"x": [1, 2, 3, np.nan], "y": [np.nan, 20, 30, 40]}
 
-    for return_type in ["matrix", "dataframe"]:
+    return_types = ["matrix"]
+
+    if have_pandas:
+        return_types.append("dataframe")
+
+    for return_type in return_types:
         mat = dmatrix("x + y", data=data, return_type=return_type)
         assert np.array_equal(mat, [[1, 2, 20],
                                     [1, 3, 30]])