ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix dict eq() checks

Browse Source
This commit is contained in:
Ogi Moore 2019-11-20 21:22:46 -08:00
parent 477feb777b
commit 71c4807559
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pyqtgraph/functions.py
View File

@ -11,6 +11,7 @@ import numpy as np
import decimal, re import decimal, re
import ctypes import ctypes
import sys, struct import sys, struct
from .pgcollections import OrderedDict
from .python2_3 import asUnicode, basestring from .python2_3 import asUnicode, basestring
from .Qt import QtGui, QtCore, QT_LIB from .Qt import QtGui, QtCore, QT_LIB
from . import getConfigOption, setConfigOptions from . import getConfigOption, setConfigOptions
@ -446,11 +447,15 @@ def eq(a, b):
if isinstance(a, dict) and isinstance(b, dict): if isinstance(a, dict) and isinstance(b, dict):
if type(a) != type(b) or len(a) != len(b): if type(a) != type(b) or len(a) != len(b):
return False return False
if sorted(a.keys()) != sorted(b.keys()): if set(a.keys()) != set(b.keys()):
return False return False
for k,v in a.items(): for k, v in a.items():
if not eq(v, b[k]): if not eq(v, b[k]):
return False return False
if isinstance(a, OrderedDict) or sys.version_info >= (3, 7):
for a_item, b_item in zip(a.items(), b.items()):
if not eq(a_item, b_item):
return False
return True return True
if isinstance(a, (list, tuple)) and isinstance(b, (list, tuple)): if isinstance(a, (list, tuple)) and isinstance(b, (list, tuple)):
if type(a) != type(b) or len(a) != len(b): if type(a) != type(b) or len(a) != len(b):