Revert "refactored skipna to switch"

This reverts commit 23bbe73.

Author: rohanp

pandas/core/nanops.py

@@ -87,6 +87,7 @@ def _f(*args, **kwargs):
 
         return _f
 
+<<<<<<< HEAD
 
 class skipna_switch(object):
 
@@ -103,6 +104,8 @@ def f(values, axis=None, skipna=True, **kwds):
                 return self.alt(values, axis, **kwds)
 
         return f
+=======
+>>>>>>> parent of 23bbe7332... refactored skipna to switch
 
 
 class bottleneck_switch(object):
@@ -355,13 +358,15 @@ def nanmean(values, axis=None, skipna=True):
     return _wrap_results(the_mean, dtype)
 
 
-@skipna_switch(np.median)
 @disallow('M8')
 @bottleneck_switch()
 def nanmedian(values, axis=None, skipna=True):
 
     values, mask, dtype, dtype_max = _get_values(values, skipna)
 
+    if not skipna:
+        return _wrap_results(np.median(values, axis=axis), dtype)
+
     def get_median(x):
         mask = notna(x)
         if not skipna and not mask.all():

pandas/tests/test_panel.py

@@ -91,14 +91,15 @@ def test_mean(self):
     def test_prod(self):
         self._check_stat_op('prod', np.prod)
 
+    
     def test_median(self):
-        def wrapper(x):
+        def wrapper(x, **kwargs):
             if isna(x).any():
                 return np.nan
             return np.median(x)
-
         self._check_stat_op('median', wrapper)
 
+
     def test_min(self):
         self._check_stat_op('min', np.min)
 

pandas/util/testing.py

@@ -1088,6 +1088,7 @@ def assert_categorical_equal(left, right, check_dtype=True,
 
 
 def raise_assert_detail(obj, message, left, right, diff=None):
+    import pdb; pdb.set_trace()
     if isinstance(left, np.ndarray):
         left = pprint_thing(left)
     if isinstance(right, np.ndarray):
@@ -1219,7 +1220,8 @@ def assert_series_equal(left, right, check_dtype=True,
         Specify object name being compared, internally used to show appropriate
         assertion message
     """
-
+    if np.isclose(left[0], 0.731904040441):
+        import pdb; pdb.set_trace()
     # instance validation
     _check_isinstance(left, right, Series)