diff --git a/pyqtgraph/functions.py b/pyqtgraph/functions.py index b38888fe..8ef57742 100644 --- a/pyqtgraph/functions.py +++ b/pyqtgraph/functions.py @@ -15,7 +15,7 @@ from .python2_3 import asUnicode, basestring from .Qt import QtGui, QtCore, USE_PYSIDE from . import getConfigOption, setConfigOptions from . import debug - +from .metaarray import MetaArray Colors = { diff --git a/pyqtgraph/tests/test_functions.py b/pyqtgraph/tests/test_functions.py index eff56635..68f3dc24 100644 --- a/pyqtgraph/tests/test_functions.py +++ b/pyqtgraph/tests/test_functions.py @@ -344,14 +344,14 @@ def test_eq(): a2 = a1 + 1 a3 = a2.astype('int') a4 = np.empty((0, 20)) - assert not eq(a1, a2) - assert not eq(a1, a3) - assert not eq(a1, a4) + assert not eq(a1, a2) # same shape/dtype, different values + assert not eq(a1, a3) # same shape, different dtype and values + assert not eq(a1, a4) # different shape (note: np.all gives True if one array has size 0) - assert eq(a2, a3) - assert not eq(a2, a4) + assert not eq(a2, a3) # same values, but different dtype + assert not eq(a2, a4) # different shape - assert not eq(a3, a4) + assert not eq(a3, a4) # different shape and dtype assert eq(a4, a4.copy()) assert not eq(a4, a4.T)