Merge branch 'master' of https://github.com/goyodiaz/pandas into goyodiaz-master

Conflicts:
	doc/source/release.rst

Author: jreback

doc/source/release.rst

@@ -513,6 +513,8 @@ Bug Fixes
   - Fix a bug when indexing with ``np.nan`` via ``iloc/loc`` (:issue:`5016`)
   - Fixed a bug where low memory c parser could create different types in different
     chunks of the same file. Now coerces to numerical type or raises warning. (:issue:`3866`)
+  - Fix a bug where reshaping a ``Series`` to its own shape raised ``TypeError`` (:issue:`4554`)
+    and other reshaping issues.
 
 pandas 0.12.0
 -------------

pandas/core/series.py

@@ -697,18 +697,21 @@ def repeat(self, reps):
         new_values = self.values.repeat(reps)
         return self._constructor(new_values, index=new_index, name=self.name)
 
-    def reshape(self, newshape, order='C'):
+    def reshape(self, *args, **kwargs):
         """
         See numpy.ndarray.reshape
         """
-        if order not in ['C', 'F']:
-            raise TypeError(
-                "must specify a tuple / singular length to reshape")
-
-        if isinstance(newshape, tuple) and len(newshape) > 1:
-            return self.values.reshape(newshape, order=order)
+        if len(args) == 1 and hasattr(args[0], '__iter__'):
+            shape = args[0]
         else:
-            return ndarray.reshape(self, newshape, order)
+            shape = args
+
+        if tuple(shape) == self.shape:
+            # XXX ignoring the "order" keyword.
+            return self
+
+        return self.values.reshape(shape, **kwargs)
+
 
     def get(self, label, default=None):
         """

pandas/tests/test_series.py

@@ -1045,12 +1045,16 @@ def test_basic_getitem_setitem_corner(self):
                           [5, slice(None, None)], 2)
 
     def test_reshape_non_2d(self):
+        # GH 4554
         x = Series(np.random.random(201), name='x')
-        self.assertRaises(TypeError, x.reshape, (len(x),))
+        self.assertTrue(x.reshape(x.shape,) is x)
 
         # GH 2719
         a = Series([1, 2, 3, 4])
-        self.assertRaises(TypeError, a.reshape, 2, 2)
+        result = a.reshape(2, 2)
+        expected = a.values.reshape(2, 2)
+        np.testing.assert_array_equal(result, expected)
+        self.assertTrue(type(result) is type(expected))
 
     def test_reshape_2d_return_array(self):
         x = Series(np.random.random(201), name='x')