Changing axis handling to depend on object passed

Author: brandonmburroughs

pandas/tools/merge.py

@@ -1412,7 +1412,10 @@ def __init__(self, objs, axis=0, join='outer', join_axes=None,
  self.objs = objs
 
  # Standardize axis parameter to int
- axis = DataFrame()._get_axis_number(axis)
+ if isinstance(sample, Series):
+ axis = DataFrame()._get_axis_number(axis)
+ else:
+ axis = sample._get_axis_number(axis)
 
  # Need to flip BlockManager axis in the DataFrame special case
  self._is_frame = isinstance(sample, DataFrame)