Add backport ordereddict to repository

Merge remote-tracking branch 'kif/master' into develop

Conflicts:
	pyqtgraph/pgcollections.py

pyqtgraph/ordereddict.py

@@ -0,0 +1,127 @@
+# Copyright (c) 2009 Raymond Hettinger
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+#     The above copyright notice and this permission notice shall be
+#     included in all copies or substantial portions of the Software.
+#
+#     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+#     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#     OTHER DEALINGS IN THE SOFTWARE.
+
+from UserDict import DictMixin
+
+class OrderedDict(dict, DictMixin):
+
+    def __init__(self, *args, **kwds):
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        try:
+            self.__end
+        except AttributeError:
+            self.clear()
+        self.update(*args, **kwds)
+
+    def clear(self):
+        self.__end = end = []
+        end += [None, end, end]         # sentinel node for doubly linked list
+        self.__map = {}                 # key --> [key, prev, next]
+        dict.clear(self)
+
+    def __setitem__(self, key, value):
+        if key not in self:
+            end = self.__end
+            curr = end[1]
+            curr[2] = end[1] = self.__map[key] = [key, curr, end]
+        dict.__setitem__(self, key, value)
+
+    def __delitem__(self, key):
+        dict.__delitem__(self, key)
+        key, prev, next = self.__map.pop(key)
+        prev[2] = next
+        next[1] = prev
+
+    def __iter__(self):
+        end = self.__end
+        curr = end[2]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[2]
+
+    def __reversed__(self):
+        end = self.__end
+        curr = end[1]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[1]
+
+    def popitem(self, last=True):
+        if not self:
+            raise KeyError('dictionary is empty')
+        if last:
+            key = reversed(self).next()
+        else:
+            key = iter(self).next()
+        value = self.pop(key)
+        return key, value
+
+    def __reduce__(self):
+        items = [[k, self[k]] for k in self]
+        tmp = self.__map, self.__end
+        del self.__map, self.__end
+        inst_dict = vars(self).copy()
+        self.__map, self.__end = tmp
+        if inst_dict:
+            return (self.__class__, (items,), inst_dict)
+        return self.__class__, (items,)
+
+    def keys(self):
+        return list(self)
+
+    setdefault = DictMixin.setdefault
+    update = DictMixin.update
+    pop = DictMixin.pop
+    values = DictMixin.values
+    items = DictMixin.items
+    iterkeys = DictMixin.iterkeys
+    itervalues = DictMixin.itervalues
+    iteritems = DictMixin.iteritems
+
+    def __repr__(self):
+        if not self:
+            return '%s()' % (self.__class__.__name__,)
+        return '%s(%r)' % (self.__class__.__name__, self.items())
+
+    def copy(self):
+        return self.__class__(self)
+
+    @classmethod
+    def fromkeys(cls, iterable, value=None):
+        d = cls()
+        for key in iterable:
+            d[key] = value
+        return d
+
+    def __eq__(self, other):
+        if isinstance(other, OrderedDict):
+            if len(self) != len(other):
+                return False
+            for p, q in  zip(self.items(), other.items()):
+                if p != q:
+                    return False
+            return True
+        return dict.__eq__(self, other)
+
+    def __ne__(self, other):
+        return not self == other

pyqtgraph/pgcollections.py

@@ -17,78 +17,7 @@ try:
     from collections import OrderedDict
 except ImportError:
     # fallback: try to use the ordereddict backport when using python 2.6
-    try:
+    from ordereddict import OrderedDict
-        from ordereddict import OrderedDict
-    except ImportError:
-        # backport not installed: use local OrderedDict
-        # Deprecated; this class is now present in Python 2.7 as collections.OrderedDict
-        # Only keeping this around for python2.6 support.
-        class OrderedDict(dict):
-            """extends dict so that elements are iterated in the order that they were added.
-            Since this class can not be instantiated with regular dict notation, it instead uses
-            a list of tuples: 
-            od = OrderedDict([(key1, value1), (key2, value2), ...])
-            items set using __setattr__ are added to the end of the key list.
-            """
-            
-            def __init__(self, data=None):
-                self.order = []
-                if data is not None:
-                    for i in data:
-                        self[i[0]] = i[1]
-            
-            def __setitem__(self, k, v):
-                if not self.has_key(k):
-                    self.order.append(k)
-                dict.__setitem__(self, k, v)
-            
-            def __delitem__(self, k):
-                self.order.remove(k)
-                dict.__delitem__(self, k)
-
-            def keys(self):
-                return self.order[:]
-            
-            def items(self):
-                it = []
-                for k in self.keys():
-                    it.append((k, self[k]))
-                return it
-            
-            def values(self):
-                return [self[k] for k in self.order]
-            
-            def remove(self, key):
-                del self[key]
-                #self.order.remove(key)
-            
-            def __iter__(self):
-                for k in self.order:
-                    yield k
-                    
-            def update(self, data):
-                """Works like dict.update, but accepts list-of-tuples as well as dict."""
-                if isinstance(data, dict):
-                    for k, v in data.iteritems():
-                        self[k] = v
-                else:
-                    for k,v in data:
-                        self[k] = v
-
-            def copy(self):
-                return OrderedDict(self.items())
-                
-            def itervalues(self):
-                for k in self.order:
-                    yield self[k]
-                    
-            def iteritems(self):
-                for k in self.order:
-                    yield (k, self[k])
-                    
-            def __deepcopy__(self, memo):
-                return OrderedDict([(k, copy.deepcopy(v, memo)) for k, v in self.iteritems()])
-        
         
 
 class ReverseDict(dict):
@@ -545,4 +474,4 @@ if __name__ == '__main__':
     lp = protect(l)
     
     t = (1, 'x', ['a', 'b'], ('c', 'd'), {'x': 1, 'y': 2})
-    tp = protect(t)
+    tp = protect(t)