From 770ce06dc1b4d721bd7afb1a815384901f5bc0d1 Mon Sep 17 00:00:00 2001 From: Ogi Moore Date: Thu, 21 Nov 2019 08:42:44 -0800 Subject: [PATCH 1/2] Revert "Allow MetaArray.__array__ to accept an optional dtype arg" --- pyqtgraph/metaarray/MetaArray.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyqtgraph/metaarray/MetaArray.py b/pyqtgraph/metaarray/MetaArray.py index 18f7250a..1410e40c 100644 --- a/pyqtgraph/metaarray/MetaArray.py +++ b/pyqtgraph/metaarray/MetaArray.py @@ -357,7 +357,7 @@ class MetaArray(object): else: return np.array(self._data) - def __array__(self, dtype=None): + def __array__(self): ## supports np.array(metaarray_instance) return self.asarray() From ef4ca9e9ea94c65390cf10206ec73fc9cbb186d7 Mon Sep 17 00:00:00 2001 From: Ognyan Moore Date: Thu, 21 Nov 2019 08:46:25 -0800 Subject: [PATCH 2/2] Incorporated correction luke suggested --- pyqtgraph/metaarray/MetaArray.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyqtgraph/metaarray/MetaArray.py b/pyqtgraph/metaarray/MetaArray.py index 1410e40c..374c9acf 100644 --- a/pyqtgraph/metaarray/MetaArray.py +++ b/pyqtgraph/metaarray/MetaArray.py @@ -357,9 +357,12 @@ class MetaArray(object): else: return np.array(self._data) - def __array__(self): + def __array__(self, dtype=None): ## supports np.array(metaarray_instance) - return self.asarray() + if dtype is None: + return self.asarray() + else: + return self.asarray().astype(dtype) def view(self, typ): ## deprecated; kept for backward compatibility