From 1f380c93c167f36130763438aeb52adfccbe3547 Mon Sep 17 00:00:00 2001 From: Luke Campagnola Date: Tue, 15 May 2018 16:37:58 -0700 Subject: [PATCH] fix itervalues --- pyqtgraph/flowchart/Node.py | 4 ++-- pyqtgraph/pgcollections.py | 2 +- pyqtgraph/util/lru_cache.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pyqtgraph/flowchart/Node.py b/pyqtgraph/flowchart/Node.py index c450a9f3..e7ce9360 100644 --- a/pyqtgraph/flowchart/Node.py +++ b/pyqtgraph/flowchart/Node.py @@ -222,7 +222,7 @@ class Node(QtCore.QObject): for t in self.inputs().values(): nodes |= set([i.node() for i in t.inputTerminals()]) return nodes - #return set([t.inputTerminals().node() for t in self.listInputs().itervalues()]) + #return set([t.inputTerminals().node() for t in self.listInputs().values()]) def __repr__(self): return "" % (self.name(), id(self)) @@ -477,7 +477,7 @@ class NodeGraphicsItem(GraphicsObject): #self.node.sigTerminalRenamed.connect(self.updateActionMenu) #def setZValue(self, z): - #for t, item in self.terminals.itervalues(): + #for t, item in self.terminals.values(): #item.setZValue(z+1) #GraphicsObject.setZValue(self, z) diff --git a/pyqtgraph/pgcollections.py b/pyqtgraph/pgcollections.py index db0fb74e..ac7f68fe 100644 --- a/pyqtgraph/pgcollections.py +++ b/pyqtgraph/pgcollections.py @@ -311,7 +311,7 @@ class ProtectedDict(dict): raise Exception("It is not safe to copy protected dicts! (instead try deepcopy, but be careful.)") def itervalues(self): - for v in self._data_.itervalues(): + for v in self._data_.values(): yield protect(v) def iteritems(self): diff --git a/pyqtgraph/util/lru_cache.py b/pyqtgraph/util/lru_cache.py index 69c1c20a..d0b160dd 100644 --- a/pyqtgraph/util/lru_cache.py +++ b/pyqtgraph/util/lru_cache.py @@ -94,14 +94,14 @@ class LRUCache(object): else: def values(self): - return [i[1] for i in self._dict.itervalues()] + return [i[1] for i in self._dict.values()] def keys(self): - return [x[0] for x in self._dict.itervalues()] + return [x[0] for x in self._dict.values()] def _resizeTo(self): - ordered = sorted(self._dict.itervalues(), key=operator.itemgetter(2))[:self.resizeTo] + ordered = sorted(self._dict.values(), key=operator.itemgetter(2))[:self.resizeTo] for i in ordered: del self._dict[i[0]] @@ -114,7 +114,7 @@ class LRUCache(object): ============= ====================================================== ''' if accessTime: - for x in sorted(self._dict.itervalues(), key=operator.itemgetter(2)): + for x in sorted(self._dict.values(), key=operator.itemgetter(2)): yield x[0], x[1] else: for x in self._dict.items():