From 07061c2299607425ee7955682ca2033a99d1d48e Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 2 Dec 2019 16:06:12 +0000 Subject: [PATCH 1/2] TYP: add some types to pandas/core/arrays/numpy_.py --- pandas/core/arrays/numpy_.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pandas/core/arrays/numpy_.py b/pandas/core/arrays/numpy_.py index 604bac4bf9b61..a30069531fd98 100644 --- a/pandas/core/arrays/numpy_.py +++ b/pandas/core/arrays/numpy_.py @@ -1,4 +1,5 @@ import numbers +from typing import Union import numpy as np from numpy.lib.mixins import NDArrayOperatorsMixin @@ -121,7 +122,7 @@ class PandasArray(ExtensionArray, ExtensionOpsMixin, NDArrayOperatorsMixin): # ------------------------------------------------------------------------ # Constructors - def __init__(self, values, copy=False): + def __init__(self, values: Union[np.ndarray, "PandasArray"], copy: bool = False): if isinstance(values, type(self)): values = values._ndarray if not isinstance(values, np.ndarray): @@ -137,8 +138,8 @@ def __init__(self, values, copy=False): if copy: values = values.copy() - self._ndarray = values - self._dtype = PandasDtype(values.dtype) + self._ndarray: np.ndarray = values + self._dtype: ExtensionDtype = PandasDtype(values.dtype) @classmethod def _from_sequence(cls, scalars, dtype=None, copy=False): From 99760371a85633b89551ef858c22ae4d80631c3e Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Mon, 2 Dec 2019 21:18:17 +0000 Subject: [PATCH 2/2] update per comments --- pandas/core/arrays/numpy_.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandas/core/arrays/numpy_.py b/pandas/core/arrays/numpy_.py index a30069531fd98..e116d180e3a14 100644 --- a/pandas/core/arrays/numpy_.py +++ b/pandas/core/arrays/numpy_.py @@ -118,6 +118,7 @@ class PandasArray(ExtensionArray, ExtensionOpsMixin, NDArrayOperatorsMixin): # pandas internals, which turns off things like block consolidation. _typ = "npy_extension" __array_priority__ = 1000 + _ndarray: np.ndarray # ------------------------------------------------------------------------ # Constructors @@ -138,8 +139,8 @@ def __init__(self, values: Union[np.ndarray, "PandasArray"], copy: bool = False) if copy: values = values.copy() - self._ndarray: np.ndarray = values - self._dtype: ExtensionDtype = PandasDtype(values.dtype) + self._ndarray = values + self._dtype = PandasDtype(values.dtype) @classmethod def _from_sequence(cls, scalars, dtype=None, copy=False):