BUG: raise exception in DataFrame.fillna when axis=1 and pass dict/Se…

…ries. close #1485

pandas/core/frame.py

@@ -2750,6 +2750,11 @@ def fillna(self, value=None, method='pad', axis=0, inplace=False,
             if len(self.columns) == 0:
                 return self
             if isinstance(value, (dict, Series)):
+                if axis == 1:
+                    raise NotImplementedError('Currently only can fill '
+                                              'with dict/Series column '
+                                              'by column')
+
                 result = self if inplace else self.copy()
                 for k, v in value.iteritems():
                     if k not in result:

pandas/tests/test_frame.py

@@ -5,13 +5,12 @@
 import cPickle as pickle
 import operator
 import os
-import sys
 import unittest
 
 import nose
 
 from numpy import random, nan
-from numpy.random import randn, randint
+from numpy.random import randn
 import numpy as np
 import numpy.ma as ma
 
@@ -3868,6 +3867,9 @@ def test_fillna_dict_series(self):
         expected = df.fillna(df.max().to_dict())
         assert_frame_equal(result, expected)
 
+        # disable this for now
+        self.assertRaises(Exception, df.fillna, df.max(1), axis=1)
+
     def test_fillna_columns(self):
         df = DataFrame(np.random.randn(10, 10))
         df.values[:, ::2] = np.nan