BUG: fixes to bugs raised by moving to Cython 0.16rc2

Author: wesm

pandas/core/groupby.py

@@ -640,7 +640,7 @@ def get_group_levels(self):
     }
 
     _name_functions = {
-        'ohlc' : lambda *args: ['open', 'low', 'high', 'close']
+        'ohlc' : lambda *args: ['open', 'high', 'low', 'close']
     }
 
     def aggregate(self, values, how):

pandas/src/groupby.pyx

@@ -892,8 +892,8 @@ def group_ohlc(ndarray[float64_t, ndim=2] out,
                     out[b, 3] = NA
                 else:
                     out[b, 0] = vopen
-                    out[b, 1] = vlow
-                    out[b, 2] = vhigh
+                    out[b, 1] = vhigh
+                    out[b, 2] = vlow
                     out[b, 3] = vclose
                 b += 1
                 got_first = 0
@@ -922,8 +922,8 @@ def group_ohlc(ndarray[float64_t, ndim=2] out,
             out[b, 3] = NA
         else:
             out[b, 0] = vopen
-            out[b, 1] = vlow
-            out[b, 2] = vhigh
+            out[b, 1] = vhigh
+            out[b, 2] = vlow
             out[b, 3] = vclose
 
 

pandas/src/tseries.pyx

@@ -451,7 +451,12 @@ def maybe_booleans_to_slice(ndarray[uint8_t, cast=True] mask):
                 end = i
                 finished = 1
 
-    return slice(start, end)
+    if not started:
+        return slice(0, 0)
+    if not finished:
+        return slice(start, None)
+    else:
+        return slice(start, end)
 
 
 @cython.wraparound(False)

pandas/tests/test_timeseries.py

@@ -239,7 +239,7 @@ def test_ohlc_5min(self):
         def _ohlc(group):
             if isnull(group).all():
                 return np.repeat(np.nan, 4)
-            return [group[0], group.min(), group.max(), group[-1]]
+            return [group[0], group.max(), group.min(), group[-1]]
 
         rng = date_range('1/1/2000 00:00:00', '1/1/2000 5:59:50',
                          freq='10s')
@@ -807,7 +807,7 @@ def test_convert_upsample(self):
         self.assertEquals(result[0], s[0])
         self.assertEquals(result[-1], s[-1])
 
-    def test_convert_olhc(self):
+    def test_convert_ohlc(self):
         s = self.series
 
         grouper = TimeGrouper(Minute(5), closed='right', label='right')

pandas/tests/test_tseries.py

@@ -420,7 +420,7 @@ def test_group_ohlc():
     def _ohlc(group):
         if isnull(group).all():
             return np.repeat(np.nan, 4)
-        return [group[0], group.min(), group.max(), group[-1]]
+        return [group[0], group.max(), group.min(), group[-1]]
 
     expected = np.array([_ohlc(obj[:6]), _ohlc(obj[6:12]),
                          _ohlc(obj[12:])])