API: add/clarify numpy ufunc prepare/wrap

Author: jreback

pandas/core/generic.py

@@ -717,8 +717,8 @@ def __abs__(self):
     def __array__(self, dtype=None):
         return _values_from_object(self)
 
-    def __array_wrap__(self, result, copy=False):
-        d = self._construct_axes_dict(self._AXIS_ORDERS, copy=copy)
+    def __array_wrap__(self, result, context=None):
+        d = self._construct_axes_dict(self._AXIS_ORDERS, copy=False)
         return self._constructor(result, **d).__finalize__(self)
 
     # ideally we would define this to avoid the getattr checks, but

pandas/core/series.py

@@ -366,18 +366,23 @@ def view(self, dtype=None):
                                  index=self.index).__finalize__(self)
 
     def __array__(self, result=None):
-        """ the array interface, return my values """
+        """
+        the array interface, return my values
+        """
         return self.values
 
-    def __array_wrap__(self, result, copy=False):
+    def __array_wrap__(self, result, context=None):
         """
-        Gets called prior to a ufunc (and after)
+        Gets called after a ufunc
         """
         return self._constructor(result, index=self.index,
-                                 copy=copy).__finalize__(self)
+                                 copy=False).__finalize__(self)
 
-    def __contains__(self, key):
-        return key in self.index
+    def __array_prepare__(self, result, context=None):
+        """
+        Gets called prior to a ufunc
+        """
+        return result
 
     # complex
     @property