Skip to content

Commit

Permalink
minor import and test corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
campagnola committed Oct 4, 2017
1 parent 7c9107f commit 9ef9f73
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pyqtgraph/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from .Qt import QtGui, QtCore, USE_PYSIDE
from . import getConfigOption, setConfigOptions
from . import debug

from .metaarray import MetaArray


Colors = {
Expand Down
12 changes: 6 additions & 6 deletions pyqtgraph/tests/test_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,14 @@ def __eq__(self, x):
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)
Expand Down

0 comments on commit 9ef9f73

Please sign in to comment.