BUG: flip left<->right in Index._join_level, GH #547

pandas-dev · Dec 29, 2011 · c2ce803 · c2ce803
1 parent 716ebdc
commit c2ce803
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/pandas/core/index.py b/pandas/core/index.py
@@ -637,6 +637,7 @@ def _join_level(self, other, level, how='left', return_indexers=False):
         flip_order = not isinstance(self, MultiIndex)
         if flip_order:
             left, right = right, left
+            how = {'right': 'left', 'left': 'right'}.get(how, how)
 
         level = left._get_level_number(level)
 
@@ -1860,4 +1861,4 @@ def _ensure_index(index_like):
 
 def _validate_join_method(method):
     if method not in ['left', 'right', 'inner', 'outer']:
-        raise Exception('do not recognize join method %s' % how)
+        raise Exception('do not recognize join method %s' % method)
diff --git a/pandas/tests/test_index.py b/pandas/tests/test_index.py
@@ -1164,23 +1164,24 @@ def _check_how(other, how):
                                                 level='second',
                                                 return_indexers=True)
 
-            join_index2, ridx2, lidx2 = self.index.join(other, how=how,
-                                                        level='second',
-                                                        return_indexers=True)
-
-            self.assert_(join_index.equals(join_index2))
-            self.assert_(np.array_equal(lidx, lidx2))
-            self.assert_(np.array_equal(ridx, ridx2))
-
-            exp_level = self.index.levels[1].join(other, how=how)
+            exp_level = other.join(self.index.levels[1], how=how)
             self.assert_(join_index.levels[0].equals(self.index.levels[0]))
             self.assert_(join_index.levels[1].equals(exp_level))
 
             # pare down levels
             mask = np.array([x[1] in exp_level for x in self.index], dtype=bool)
             exp_values = self.index.values[mask]
             self.assert_(np.array_equal(join_index.values, exp_values))
-            self.assert_(np.array_equal(join_index2.values, exp_values))
+
+            if how in ('outer', 'inner'):
+                join_index2, ridx2, lidx2 = \
+                    self.index.join(other, how=how, level='second',
+                                    return_indexers=True)
+
+                self.assert_(join_index.equals(join_index2))
+                self.assert_(np.array_equal(lidx, lidx2))
+                self.assert_(np.array_equal(ridx, ridx2))
+                self.assert_(np.array_equal(join_index2.values, exp_values))
 
         def _check_all(other):
             _check_how(other, 'outer')