Merge commit 'v0.7.0rc1-2-g91cfcb4' into debian

* commit 'v0.7.0rc1-2-g91cfcb4':
  BUG: Fix out-of-bounds segfault in pad_object and backfill_object methods
  BLD: exclude png files from tarball
  RLS: 0.7.0 Release Candidate 1
  ENH: don't try to autofmt_xdate if sharex=False in DataFrame.plot
  TST: python 2.5/6 issues with Decimal

Author: yarikoptic

MANIFEST.in

@@ -17,6 +17,7 @@ global-exclude *.pyd
 global-exclude *.pyc
 global-exclude .git*
 global-exclude .DS_Store
+global-exclude *.png
 
 # include examples/data/*
 # recursive-include examples *.py

RELEASE.rst

@@ -217,7 +217,9 @@ pandas 0.7.0
   - Catch misreported console size when running IPython within Emacs
   - Fix minor bug in pivot table margins, loss of index names and length-1
     'All' tuple in row labels
-  - Add support for legacy
+  - Add support for legacy WidePanel objects to be read from HDFStore
+  - Fix out-of-bounds segfault in pad_object and backfill_object methods when
+    either source or target array are empty
 
 Thanks
 ------

pandas/core/frame.py

@@ -3628,11 +3628,11 @@ def plot(self, subplots=False, sharex=True, sharey=False, use_index=True,
             self._bar_plot(axes, subplots=subplots, grid=grid, rot=rot,
                            legend=legend)
 
-        # try to make things prettier
-        try:
-            fig.autofmt_xdate()
-        except Exception:  # pragma: no cover
-            pass
+        if not subplots or (subplots and sharex):
+            try:
+                fig.autofmt_xdate()
+            except Exception:  # pragma: no cover
+                pass
 
         plt.draw_if_interactive()
         if subplots:

pandas/core/series.py

@@ -1781,6 +1781,7 @@ def plot(self, label=None, kind='line', use_index=True, rot=30, ax=None,
         Intended to be used in ipython --pylab mode
         """
         import matplotlib.pyplot as plt
+        import pandas.tools.plotting as gfx
 
         if label is not None:
             kwds = kwds.copy()
@@ -1801,6 +1802,7 @@ def plot(self, label=None, kind='line', use_index=True, rot=30, ax=None,
                 ax.semilogy(x, self.values.astype(float), style, **kwds)
             else:
                 ax.plot(x, self.values.astype(float), style, **kwds)
+            gfx.format_date_labels(ax)
         elif kind == 'bar':
             xinds = np.arange(N) + 0.25
             ax.bar(xinds, self.values.astype(float), 0.5,
@@ -1815,14 +1817,6 @@ def plot(self, label=None, kind='line', use_index=True, rot=30, ax=None,
             ax.set_xticklabels(self.index, rotation=rot, fontsize=fontsize)
 
         ax.grid(grid)
-
-        # try to make things prettier
-        try:
-            fig = plt.gcf()
-            fig.autofmt_xdate()
-        except Exception:  # pragma: no cover
-            pass
-
         plt.draw_if_interactive()
 
         return ax

pandas/src/generate_code.py

@@ -147,6 +147,9 @@ def backfill_%(name)s(ndarray[%(c_type)s] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = oldLength - 1
     newPos = newLength - 1
 
@@ -221,6 +224,9 @@ def pad_%(name)s(ndarray[%(c_type)s] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = 0
     newPos = 0
 

pandas/src/generated.pyx

@@ -216,6 +216,9 @@ def pad_float64(ndarray[float64_t] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = 0
     newPos = 0
 
@@ -271,6 +274,9 @@ def pad_object(ndarray[object] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = 0
     newPos = 0
 
@@ -326,6 +332,9 @@ def pad_int32(ndarray[int32_t] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = 0
     newPos = 0
 
@@ -381,6 +390,9 @@ def pad_int64(ndarray[int64_t] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = 0
     newPos = 0
 
@@ -436,6 +448,9 @@ def pad_bool(ndarray[uint8_t] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = 0
     newPos = 0
 
@@ -492,6 +507,9 @@ def backfill_float64(ndarray[float64_t] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = oldLength - 1
     newPos = newLength - 1
 
@@ -541,6 +559,9 @@ def backfill_object(ndarray[object] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = oldLength - 1
     newPos = newLength - 1
 
@@ -590,6 +611,9 @@ def backfill_int32(ndarray[int32_t] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = oldLength - 1
     newPos = newLength - 1
 
@@ -639,6 +663,9 @@ def backfill_int64(ndarray[int64_t] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = oldLength - 1
     newPos = newLength - 1
 
@@ -688,6 +715,9 @@ def backfill_bool(ndarray[uint8_t] oldIndex,
     fill_vec = np.empty(len(newIndex), dtype = np.int32)
     fill_vec.fill(-1)
 
+    if oldLength == 0 or newLength == 0:
+        return fill_vec
+
     oldPos = oldLength - 1
     newPos = newLength - 1
 

pandas/tests/test_frame.py

@@ -841,6 +841,13 @@ def test_icol(self):
         expected = df.ix[:, 8:14]
         assert_frame_equal(result, expected)
 
+    def test_iget_value(self):
+        for i, row in enumerate(self.frame.index):
+            for j, col in enumerate(self.frame.columns):
+                result = self.frame.iget_value(i, j)
+                expected = self.frame.get_value(row, col)
+                assert_almost_equal(result, expected)
+
 _seriesd = tm.getSeriesData()
 _tsd = tm.getTimeSeriesData()
 

pandas/tests/test_groupby.py

@@ -1254,12 +1254,12 @@ def test_convert_objects_leave_decimal_alone(self):
         labels = np.array(['a', 'b', 'c', 'd', 'e'], dtype='O')
 
         def convert_fast(x):
-            return Decimal(x.mean())
+            return Decimal(str(x.mean()))
 
         def convert_force_pure(x):
             # base will be length 0
             assert(len(x.base) == len(x))
-            return Decimal(x.mean())
+            return Decimal(str(x.mean()))
 
         grouped = s.groupby(labels)
 

pandas/tests/test_series.py

@@ -1609,7 +1609,7 @@ def test_map_int(self):
     def test_map_decimal(self):
         from decimal import Decimal
 
-        result = self.series.map(Decimal)
+        result = self.series.map(lambda x: Decimal(str(x)))
         self.assert_(result.dtype == np.object_)
         self.assert_(isinstance(result[0], Decimal))
 

pandas/tests/test_tseries.py

@@ -236,6 +236,32 @@ def test_get_reverse_indexer():
     expected = np.array([4, 2, 3, 6, 7], dtype='i4')
     assert(np.array_equal(result, expected))
 
+def test_pad_backfill_object_segfault():
+    from datetime import datetime
+    old = np.array([], dtype='O')
+    new = np.array([datetime(2010, 12, 31)], dtype='O')
+
+    result = lib.pad_object(old, new, lib.map_indices_object(old),
+                            lib.map_indices_object(new))
+    expected = np.array([-1], dtype='i4')
+    assert(np.array_equal(result, expected))
+
+    result = lib.pad_object(new, old, lib.map_indices_object(new),
+                            lib.map_indices_object(old))
+    expected = np.array([], dtype='i4')
+    assert(np.array_equal(result, expected))
+
+    result = lib.backfill_object(old, new, lib.map_indices_object(old),
+                                 lib.map_indices_object(new))
+    expected = np.array([-1], dtype='i4')
+    assert(np.array_equal(result, expected))
+
+    result = lib.backfill_object(new, old, lib.map_indices_object(new),
+                            lib.map_indices_object(old))
+    expected = np.array([], dtype='i4')
+    assert(np.array_equal(result, expected))
+
+
 class TestTypeInference(unittest.TestCase):
 
     def test_integers(self):

pandas/tools/plotting.py

@@ -99,6 +99,18 @@ def _stringify(x):
     else:
         return str(x)
 
+def format_date_labels(ax):
+    # mini version of autofmt_xdate
+    try:
+        for label in ax.get_xticklabels():
+            label.set_ha('right')
+            label.set_rotation(30)
+        fig = ax.get_figure()
+        fig.subplots_adjust(bottom=0.2)
+    except Exception: # pragma: no cover
+        pass
+
+
 def scatter_plot(data, x, y, by=None, ax=None, figsize=None):
     """
 

setup.py

@@ -147,7 +147,7 @@
 
 DISTNAME = 'pandas'
 LICENSE = 'BSD'
-AUTHOR = "AQR Capital Management, LLC"
+AUTHOR = "The pandas Development Team"
 MAINTAINER = "Wes McKinney"
 MAINTAINER_EMAIL = "[email protected]"
 URL = "http://pandas.sourceforge.net"
@@ -169,7 +169,7 @@
 MICRO = 0
 ISRELEASED = False
 VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
-QUALIFIER = ''
+QUALIFIER = 'rc1'
 
 FULLVERSION = VERSION
 if not ISRELEASED: