TST: fixed reference to legacy time rules

Author: adamklein

pandas/core/groupby.py

@@ -626,7 +626,7 @@ def get_group_levels(self):
 
         return name_list
 
-def generate_bins_generic(values, binner, closed, label, drop):
+def generate_bins_generic(values, binner, closed, label):
     """
     Generate bin edge offsets and bin labels for one array using another array
     which has bin edge values. Both arrays must be sorted.
@@ -691,7 +691,7 @@ def generate_bins_generic(values, binner, closed, label, drop):
             break
 
         # if we've seen some values or not ignoring empty bins
-        if vc != 0 or not drop:
+        if vc != 0:
             bins[bc] = j
             bc += 1
             vc = 0

pandas/tests/test_frame.py

@@ -3379,7 +3379,7 @@ def test_shift(self):
         shiftedFrame = self.tsframe.shift(5, offset=datetools.BDay())
         self.assert_(len(shiftedFrame) == len(self.tsframe))
 
-        shiftedFrame2 = self.tsframe.shift(5, timeRule='WEEKDAY')
+        shiftedFrame2 = self.tsframe.shift(5, timeRule='B')
         assert_frame_equal(shiftedFrame, shiftedFrame2)
 
         d = self.tsframe.index[0]

pandas/tests/test_series.py

@@ -1645,8 +1645,8 @@ def test_shift(self):
         unshifted = self.ts.shift(0, offset=offset)
         assert_series_equal(unshifted, self.ts)
 
-        shifted = self.ts.shift(1, timeRule='WEEKDAY')
-        unshifted = shifted.shift(-1, timeRule='WEEKDAY')
+        shifted = self.ts.shift(1, timeRule='B')
+        unshifted = shifted.shift(-1, timeRule='B')
 
         assert_series_equal(unshifted, self.ts)