pandas-dev
diff --git a/‎doc/source/basics.rst
+1-1 b/‎doc/source/basics.rst
+1-1
diff --git a/‎doc/source/dsintro.rst
+17-13 b/‎doc/source/dsintro.rst
+17-13
diff --git a/‎doc/source/enhancingperf.rst
+26-8 b/‎doc/source/enhancingperf.rst
+26-8
diff --git a/‎doc/source/release.rst
+62 b/‎doc/source/release.rst
+62
diff --git a/‎doc/source/v0.13.0.txt
+61 b/‎doc/source/v0.13.0.txt
+61
diff --git a/‎pandas/core/array.py
+16 b/‎pandas/core/array.py
+16
diff --git a/‎pandas/core/base.py
-14 b/‎pandas/core/base.py
-14
diff --git a/‎pandas/core/common.py
+17-8 b/‎pandas/core/common.py
+17-8
@@ -478,7 +478,7 @@ maximum value for each column occurred:
 
    tsdf = DataFrame(randn(1000, 3), columns=['A', 'B', 'C'],
                     index=date_range('1/1/2000', periods=1000))
-   tsdf.apply(lambda x: x.index[x.dropna().argmax()])
+   tsdf.apply(lambda x: x[x.idxmax()])
 
 You may also pass additional arguments and keyword arguments to the ``apply``
 method. For instance, consider the following function you would like to apply:
 
@@ -44,10 +44,15 @@ When using pandas, we recommend the following import convention:
 Series
 ------
 
-:class:`Series` is a one-dimensional labeled array (technically a subclass of
-ndarray) capable of holding any data type (integers, strings, floating point
-numbers, Python objects, etc.). The axis labels are collectively referred to as
-the **index**. The basic method to create a Series is to call:
+.. warning::
+
+   In 0.13.0 ``Series`` has internaly been refactored to no longer sub-class ``ndarray``
+   but instead subclass ``NDFrame``, similarly to the rest of the pandas containers. This should be
+   a transparent change with only very limited API implications (See the :ref:`release notes <release.refactoring_0_13_0>`)
+
+:class:`Series` is a one-dimensional labeled array capable of holding any data
+type (integers, strings, floating point numbers, Python objects, etc.). The axis
+labels are collectively referred to as the **index**. The basic method to create a Series is to call:
 
 ::
 
@@ -109,9 +114,8 @@ provided. The value will be repeated to match the length of **index**
 Series is ndarray-like
 ~~~~~~~~~~~~~~~~~~~~~~
 
-As a subclass of ndarray, Series is a valid argument to most NumPy functions
-and behaves similarly to a NumPy array. However, things like slicing also slice
-the index.
+``Series`` acts very similary to a ``ndarray``, and is a valid argument to most NumPy functions.
+However, things like slicing also slice the index.
 
 .. ipython :: python
 
@@ -177,7 +181,7 @@ labels.
 
 The result of an operation between unaligned Series will have the **union** of
 the indexes involved. If a label is not found in one Series or the other, the
-result will be marked as missing (NaN). Being able to write code without doing
+result will be marked as missing ``NaN``. Being able to write code without doing
 any explicit data alignment grants immense freedom and flexibility in
 interactive data analysis and research. The integrated data alignment features
 of the pandas data structures set pandas apart from the majority of related
@@ -924,11 +928,11 @@ Here we slice to a Panel4D.
     from pandas.core import panelnd
     Panel5D = panelnd.create_nd_panel_factory(
         klass_name   = 'Panel5D',
-        axis_orders  = [ 'cool', 'labels','items','major_axis','minor_axis'],
-        axis_slices  = { 'labels' : 'labels', 'items' : 'items',
-	                 'major_axis' : 'major_axis', 'minor_axis' : 'minor_axis' },
-        slicer       = Panel4D,
-        axis_aliases = { 'major' : 'major_axis', 'minor' : 'minor_axis' },
+        orders  = [ 'cool', 'labels','items','major_axis','minor_axis'],
+        slices  = { 'labels' : 'labels', 'items' : 'items',
+	                'major_axis' : 'major_axis', 'minor_axis' : 'minor_axis' },
+        slicer  = Panel4D,
+        aliases = { 'major' : 'major_axis', 'minor' : 'minor_axis' },
         stat_axis    = 2)
 
     p5d = Panel5D(dict(C1 = p4d))
 
@@ -26,7 +26,7 @@ Enhancing Performance
 Cython (Writing C extensions for pandas)
 ----------------------------------------
 
-For many use cases writing pandas in pure python and numpy is sufficient. In some 
+For many use cases writing pandas in pure python and numpy is sufficient. In some
 computationally heavy applications however, it can be possible to achieve sizeable
 speed-ups by offloading work to `cython <http://cython.org/>`__.
 
@@ -68,7 +68,7 @@ Here's the function in pure python:
 We achieve our result by by using ``apply`` (row-wise):
 
 .. ipython:: python
-   
+
    %timeit df.apply(lambda x: integrate_f(x['a'], x['b'], x['N']), axis=1)
 
 But clearly this isn't fast enough for us. Let's take a look and see where the
@@ -83,7 +83,7 @@ By far the majority of time is spend inside either ``integrate_f`` or ``f``,
 hence we'll concentrate our efforts cythonizing these two functions.
 
 .. note::
- 
+
   In python 2 replacing the ``range`` with its generator counterpart (``xrange``)
   would mean the ``range`` line would vanish. In python 3 range is already a generator.
 
@@ -125,7 +125,7 @@ is here to distinguish between function versions):
 
    %timeit df.apply(lambda x: integrate_f_plain(x['a'], x['b'], x['N']), axis=1)
 
-Already this has shaved a third off, not too bad for a simple copy and paste. 
+Already this has shaved a third off, not too bad for a simple copy and paste.
 
 .. _enhancingperf.type:
 
@@ -175,7 +175,7 @@ in python, so maybe we could minimise these by cythonizing the apply part.
   We are now passing ndarrays into the cython function, fortunately cython plays
   very nicely with numpy.
 
-.. ipython:: 
+.. ipython::
 
    In [4]: %%cython
       ...: cimport numpy as np
@@ -205,20 +205,38 @@ The implementation is simple, it creates an array of zeros and loops over
 the rows, applying our ``integrate_f_typed``, and putting this in the zeros array.
 
 
+.. warning::
+
+   In 0.13.0 since ``Series`` has internaly been refactored to no longer sub-class ``ndarray``
+   but instead subclass ``NDFrame``, you can **not pass** a ``Series`` directly as a ``ndarray`` typed parameter
+   to a cython function. Instead pass the actual ``ndarray`` using the ``.values`` attribute of the Series.
+
+   Prior to 0.13.0
+
+   .. code-block:: python
+
+        apply_integrate_f(df['a'], df['b'], df['N'])
+
+   Use ``.values`` to get the underlying ``ndarray``
+
+   .. code-block:: python
+
+        apply_integrate_f(df['a'].values, df['b'].values, df['N'].values)
+
 .. note::
 
     Loop like this would be *extremely* slow in python, but in cython looping over
     numpy arrays is *fast*.
 
 .. ipython:: python
 
-   %timeit apply_integrate_f(df['a'], df['b'], df['N'])
+   %timeit apply_integrate_f(df['a'].values, df['b'].values, df['N'].values)
 
 We've gone another three times faster! Let's check again where the time is spent:
 
 .. ipython:: python
 
-   %prun -l 4 apply_integrate_f(df['a'], df['b'], df['N'])
+   %prun -l 4 apply_integrate_f(df['a'].values, df['b'].values, df['N'].values)
 
 As one might expect, the majority of the time is now spent in ``apply_integrate_f``,
 so if we wanted to make anymore efficiencies we must continue to concentrate our
@@ -261,7 +279,7 @@ advanced cython techniques:
 
 .. ipython:: python
 
-   %timeit apply_integrate_f_wrap(df['a'], df['b'], df['N'])
+   %timeit apply_integrate_f_wrap(df['a'].values, df['b'].values, df['N'].values)
 
 This shaves another third off!
 
 
@@ -115,6 +115,68 @@ pandas 0.13
     - ``MultiIndex.astype()`` now only allows ``np.object_``-like dtypes and
       now returns a ``MultiIndex`` rather than an ``Index``. (:issue:`4039`)
 
+**Internal Refactoring**
+
+.. _release.refactoring_0_13_0:
+
+In 0.13.0 there is a major refactor primarily to subclass ``Series`` from ``NDFrame``,
+which is the base class currently for ``DataFrame`` and ``Panel``, to unify methods
+and behaviors. Series formerly subclassed directly from ``ndarray``.
+
+- Refactor of series.py/frame.py/panel.py to move common code to generic.py
+  - added _setup_axes to created generic NDFrame structures
+  - moved methods
+
+    - from_axes,_wrap_array,axes,ix,shape,empty,swapaxes,transpose,pop
+    - __iter__,keys,__contains__,__len__,__neg__,__invert__
+    - convert_objects,as_blocks,as_matrix,values
+    - __getstate__,__setstate__ (though compat remains in frame/panel)
+    - __getattr__,__setattr__
+    - _indexed_same,reindex_like,reindex,align,where,mask
+    - filter (also added axis argument to selectively filter on a different axis)
+    - reindex,reindex_axis (which was the biggest change to make generic)
+    - truncate (moved to become part of ``NDFrame``)
+
+- These are API changes which make ``Panel`` more consistent with ``DataFrame``
+  - swapaxes on a Panel with the same axes specified now return a copy
+  - support attribute access for setting
+  - filter supports same api as original DataFrame filter
+
+- Reindex called with no arguments will now return a copy of the input object
+
+- Series now inherits from ``NDFrame`` rather than directly from ``ndarray``.
+  There are several minor changes that affect the API.
+
+  - numpy functions that do not support the array interface will now
+    return ``ndarrays`` rather than series, e.g. ``np.diff`` and ``np.where``
+  - ``Series(0.5)`` would previously return the scalar ``0.5``, this is no
+    longer supported
+  - several methods from frame/series have moved to ``NDFrame``
+    (convert_objects,where,mask)
+  - ``TimeSeries`` is now an alias for ``Series``. the property ``is_time_series``
+    can be used to distinguish (if desired)
+
+- Refactor of Sparse objects to use BlockManager
+
+  - Created a new block type in internals, ``SparseBlock``, which can hold multi-dtypes
+    and is non-consolidatable. ``SparseSeries`` and ``SparseDataFrame`` now inherit
+    more methods from there hierarchy (Series/DataFrame), and no longer inherit
+    from ``SparseArray`` (which instead is the object of the ``SparseBlock``)
+  - Sparse suite now supports integration with non-sparse data. Non-float sparse
+    data is supportable (partially implemented)
+  - Operations on sparse structures within DataFrames should preserve sparseness,
+    merging type operations will convert to dense (and back to sparse), so might
+    be somewhat inefficient
+  - enable setitem on ``SparseSeries`` for boolean/integer/slices
+  - ``SparsePanels`` implementation is unchanged (e.g. not using BlockManager, needs work)
+
+- added ``ftypes`` method to Series/DataFame, similar to ``dtypes``, but indicates
+  if the underlying is sparse/dense (as well as the dtype)
+
+- All ``NDFrame`` objects now have a ``_prop_attributes``, which can be used to indcated various
+  values to propogate to a new object from an existing (e.g. name in ``Series`` will follow
+  more automatically now)
+
 **Experimental Features**
 
 **Bug Fixes**
 
@@ -134,6 +134,67 @@ Enhancements
          from pandas import offsets
          td + offsets.Minute(5) + offsets.Milli(5)
 
+Internal Refactoring
+~~~~~~~~~~~~~~~~~~~~
+
+In 0.13.0 there is a major refactor primarily to subclass ``Series`` from ``NDFrame``,
+which is the base class currently for ``DataFrame`` and ``Panel``, to unify methods
+and behaviors. Series formerly subclassed directly from ``ndarray``. (:issue:`4080`,:issue:`3862`,:issue:`816`)
+
+- Refactor of series.py/frame.py/panel.py to move common code to generic.py
+  - added _setup_axes to created generic NDFrame structures
+  - moved methods
+
+    - from_axes,_wrap_array,axes,ix,shape,empty,swapaxes,transpose,pop
+    - __iter__,keys,__contains__,__len__,__neg__,__invert__
+    - convert_objects,as_blocks,as_matrix,values
+    - __getstate__,__setstate__ (though compat remains in frame/panel)
+    - __getattr__,__setattr__
+    - _indexed_same,reindex_like,reindex,align,where,mask
+    - filter (also added axis argument to selectively filter on a different axis)
+    - reindex,reindex_axis (which was the biggest change to make generic)
+    - truncate (moved to become part of ``NDFrame``)
+
+- These are API changes which make ``Panel`` more consistent with ``DataFrame``
+  - swapaxes on a Panel with the same axes specified now return a copy
+  - support attribute access for setting
+  - filter supports same api as original DataFrame filter
+
+- Reindex called with no arguments will now return a copy of the input object
+
+- Series now inherits from ``NDFrame`` rather than directly from ``ndarray``.
+  There are several minor changes that affect the API.
+
+  - numpy functions that do not support the array interface will now
+    return ``ndarrays`` rather than series, e.g. ``np.diff`` and ``np.where``
+  - ``Series(0.5)`` would previously return the scalar ``0.5``, this is no
+    longer supported
+  - several methods from frame/series have moved to ``NDFrame``
+    (convert_objects,where,mask)
+  - ``TimeSeries`` is now an alias for ``Series``. the property ``is_time_series``
+    can be used to distinguish (if desired)
+
+- Refactor of Sparse objects to use BlockManager
+
+  - Created a new block type in internals, ``SparseBlock``, which can hold multi-dtypes
+    and is non-consolidatable. ``SparseSeries`` and ``SparseDataFrame`` now inherit
+    more methods from there hierarchy (Series/DataFrame), and no longer inherit
+    from ``SparseArray`` (which instead is the object of the ``SparseBlock``)
+  - Sparse suite now supports integration with non-sparse data. Non-float sparse
+    data is supportable (partially implemented)
+  - Operations on sparse structures within DataFrames should preserve sparseness,
+    merging type operations will convert to dense (and back to sparse), so might
+    be somewhat inefficient
+  - enable setitem on ``SparseSeries`` for boolean/integer/slices
+  - ``SparsePanels`` implementation is unchanged (e.g. not using BlockManager, needs work)
+
+- added ``ftypes`` method to Series/DataFame, similar to ``dtypes``, but indicates
+  if the underlying is sparse/dense (as well as the dtype)
+
+- All ``NDFrame`` objects now have a ``_prop_attributes``, which can be used to indcated various
+  values to propogate to a new object from an existing (e.g. name in ``Series`` will follow
+  more automatically now)
+
 Bug Fixes
 ~~~~~~~~~
 
 
@@ -34,3 +34,19 @@
     globals()[_f] = getattr(np.random, _f)
 
 NA = np.nan
+
+#### a series-like ndarray ####
+
+class SNDArray(Array):
+
+    def __new__(cls, data, index=None, name=None):
+        data = data.view(SNDArray)
+        data.index = index
+        data.name = name
+
+        return data
+
+    @property
+    def values(self):
+        return self.view(Array)
+
@@ -9,20 +9,6 @@ class StringMixin(object):
     """implements string methods so long as object defines a `__unicode__` method.
     Handles Python2/3 compatibility transparently."""
     # side note - this could be made into a metaclass if more than one object nees
-    def __str__(self):
-
-class PandasObject(object):
-    """ The base class for pandas objects """
-
-    #----------------------------------------------------------------------
-    # Reconstruction
-
-    def save(self, path):
-        com.save(self, path)
-
-    @classmethod
-    def load(cls, path):
-        return com.load(path)
 
     #----------------------------------------------------------------------
     # Formatting
 
@@ -45,17 +45,22 @@ class AmbiguousIndexError(PandasError, KeyError):
 _DATELIKE_DTYPES = set([ np.dtype(t) for t in ['M8[ns]','m8[ns]'] ])
 
 def is_series(obj):
-    return getattr(obj,'_typ',None) == 'series'
+    return getattr(obj, '_typ' ,None) == 'series'
+
 def is_sparse_series(obj):
-    return getattr(obj,'_subtyp',None) in ('sparse_series','sparse_time_series')
+    return getattr(obj, '_subtyp', None) in ('sparse_series','sparse_time_series')
+
 def is_sparse_array_like(obj):
-    return getattr(obj,'_subtyp',None) in ['sparse_array','sparse_series','sparse_array']
+    return getattr(obj, '_subtyp', None) in ['sparse_array','sparse_series','sparse_array']
+
 def is_dataframe(obj):
-    return getattr(obj,'_typ',None) == 'dataframe'
+    return getattr(obj, '_typ', None) == 'dataframe'
+
 def is_panel(obj):
-    return getattr(obj,'_typ',None) == 'panel'
+    return getattr(obj, '_typ', None) == 'panel'
+
 def is_generic(obj):
-    return getattr(obj,'_data',None) is not None
+    return getattr(obj, '_data', None) is not None
 
 def isnull(obj):
     """Detect missing values (NaN in numeric arrays, None/NaN in object arrays)
@@ -1155,7 +1160,10 @@ def _maybe_box(indexer, values, obj, key):
 
 def _values_from_object(o):
     """ return my values or the object if we are say an ndarray """
-    return o.get_values() if hasattr(o,'get_values') else o
+    f = getattr(o,'get_values',None)
+    if f is not None:
+        o = f()
+    return o
 
 def _possibly_convert_objects(values, convert_dates=True, convert_numeric=True):
     """ if we have an object dtype, try to coerce dates and/or numers """
@@ -1733,7 +1741,8 @@ def _is_sequence(x):
 
 
 def _astype_nansafe(arr, dtype, copy=True):
-    """ return a view if copy is False """
+    """ return a view if copy is False, but
+        need to be very careful as the result shape could change! """
     if not isinstance(dtype, np.dtype):
         dtype = np.dtype(dtype)