pythonthings
diff --git a/‎source_py2/python_toolbox/third_party/sortedcontainers/__init__.py‎
Lines changed: 5 additions & 6 deletions b/‎source_py2/python_toolbox/third_party/sortedcontainers/__init__.py‎
Lines changed: 5 additions & 6 deletions
diff --git a/‎source_py2/python_toolbox/third_party/sortedcontainers/sorteddict.py‎
Lines changed: 50 additions & 19 deletions b/‎source_py2/python_toolbox/third_party/sortedcontainers/sorteddict.py‎
Lines changed: 50 additions & 19 deletions
@@ -35,21 +35,20 @@
 pre-build and distribute custom extensions. Performance is a feature and
 testing has 100% coverage with unit tests and hours of stress.
 
-:copyright: (c) 2014 by Grant Jenks.
+:copyright: (c) 2015 by Grant Jenks.
 :license: Apache 2.0, see LICENSE for more details.
 
 """
 
 __title__ = 'sortedcontainers'
-__version__ = '0.9.5'
-__build__ = 0x000905
+__version__ = '1.4.4'
+__build__ = 0x010404
 __author__ = 'Grant Jenks'
 __license__ = 'Apache 2.0'
-__copyright__ = 'Copyright 2014 Grant Jenks'
+__copyright__ = 'Copyright 2015 Grant Jenks'
 
-from .sortedlist import SortedList
+from .sortedlist import SortedList, SortedListWithKey
 from .sortedset import SortedSet
 from .sorteddict import SortedDict
-from .sortedlistwithkey import SortedListWithKey
 
 __all__ = ['SortedList', 'SortedSet', 'SortedDict', 'SortedListWithKey']
@@ -3,8 +3,7 @@
 # Sorted dict implementation.
 
 from .sortedset import SortedSet
-from .sortedlist import SortedList, recursive_repr
-from .sortedlistwithkey import SortedListWithKey
+from .sortedlist import SortedList, recursive_repr, SortedListWithKey
 from collections import Set, Sequence
 from collections import KeysView as AbstractKeysView
 from collections import ValuesView as AbstractValuesView
@@ -134,7 +133,7 @@ def __init__(self, *args, **kwargs):
         self._pop = _dict.pop
         self._setdefault = _dict.setdefault
         self._setitem = _dict.__setitem__
-        self._update = _dict.update
+        self._dict_update = _dict.update
 
         # Cache function pointers to SortedList methods.
 
@@ -148,15 +147,18 @@ def __init__(self, *args, **kwargs):
         self._list_pop = _list.pop
         self._list_remove = _list.remove
         self._list_update = _list.update
+        self.irange = _list.irange
+        self.islice = _list.islice
 
         if self._key is not None:
             self.bisect_key_left = _list.bisect_key_left
             self.bisect_key_right = _list.bisect_key_right
             self.bisect_key = _list.bisect_key
+            self.irange_key = _list.irange_key
 
         self.iloc = _IlocWrapper(self)
 
-        self.update(*args, **kwargs)
+        self._update(*args, **kwargs)
 
     def clear(self):
         """Remove all elements from the dictionary."""
@@ -172,12 +174,20 @@ def __delitem__(self, key):
         self._list_remove(key)
 
     def __iter__(self):
-        """Create an iterator over the sorted keys of the dictionary."""
+        """
+        Return an iterator over the sorted keys of the dictionary.
+
+        Iterating the Mapping while adding or deleting keys may raise a
+        `RuntimeError` or fail to iterate over all entries.
+        """
         return iter(self._list)
 
     def __reversed__(self):
         """
-        Create a reversed iterator over the sorted keys of the dictionary.
+        Return a reversed iterator over the sorted keys of the dictionary.
+
+        Iterating the Mapping while adding or deleting keys may raise a
+        `RuntimeError` or fail to iterate over all entries.
         """
         return reversed(self._list)
 
@@ -189,7 +199,7 @@ def __setitem__(self, key, value):
 
     def copy(self):
         """Return a shallow copy of the sorted dictionary."""
-        return self.__class__(self._key, self._load, self.iteritems())
+        return self.__class__(self._key, self._load, self._iteritems())
 
     __copy__ = copy
 
@@ -205,7 +215,7 @@ def items(self):
             """
             Return a list of the dictionary's items (``(key, value)`` pairs).
             """
-            return list(self.iteritems())
+            return list(self._iteritems())
     else:
         def items(self):
             """
@@ -216,9 +226,16 @@ def items(self):
             return ItemsView(self)
 
     def iteritems(self):
-        """Return an iterable over the items (``(key, value)`` pairs)."""
+        """
+        Return an iterator over the items (``(key, value)`` pairs).
+
+        Iterating the Mapping while adding or deleting keys may raise a
+        `RuntimeError` or fail to iterate over all entries.
+        """
         return iter((key, self[key]) for key in self._list)
 
+    _iteritems = iteritems
+
     if hexversion < 0x03000000:
         def keys(self):
             """Return a SortedSet of the dictionary's keys."""
@@ -233,13 +250,18 @@ def keys(self):
             return KeysView(self)
 
     def iterkeys(self):
-        """Return an iterable over the keys of the dictionary."""
+        """
+        Return an iterator over the sorted keys of the Mapping.
+
+        Iterating the Mapping while adding or deleting keys may raise a
+        `RuntimeError` or fail to iterate over all entries.
+        """
         return iter(self._list)
 
     if hexversion < 0x03000000:
         def values(self):
             """Return a list of the dictionary's values."""
-            return list(self.itervalues())
+            return list(self._itervalues())
     else:
         def values(self):
             """
@@ -250,9 +272,16 @@ def values(self):
             return ValuesView(self)
 
     def itervalues(self):
-        """Return an iterable over the values of the dictionary."""
+        """
+        Return an iterator over the values of the Mapping.
+
+        Iterating the Mapping while adding or deleting keys may raise a
+        `RuntimeError` or fail to iterate over all entries.
+        """
         return iter(self[key] for key in self._list)
 
+    _itervalues = itervalues
+
     def pop(self, key, default=_NotGiven):
         """
         If *key* is in the dictionary, remove it and return its value,
@@ -309,7 +338,7 @@ def update(self, *args, **kwargs):
         those key/value pairs: ``d.update(red=1, blue=2)``.
         """
         if not len(self):
-            self._update(*args, **kwargs)
+            self._dict_update(*args, **kwargs)
             self._list_update(self._iter())
             return
 
@@ -319,13 +348,15 @@ def update(self, *args, **kwargs):
             pairs = dict(*args, **kwargs)
 
         if (10 * len(pairs)) > len(self):
-            self._update(pairs)
+            self._dict_update(pairs)
             self._list_clear()
             self._list_update(self._iter())
         else:
             for key in pairs:
                 self[key] = pairs[key]
 
+    _update = update
+
     @not26
     def viewkeys(self):
         """
@@ -357,7 +388,7 @@ def viewitems(self):
         return ItemsView(self)
 
     def __reduce__(self):
-        return (self.__class__, (self._key, self._load, list(self.iteritems())))
+        return (self.__class__, (self._key, self._load, list(self._iteritems())))
 
     @recursive_repr
     def __repr__(self):
@@ -413,7 +444,7 @@ def __iter__(self):
         over in their sorted order.
 
         Iterating views while adding or deleting entries in the dictionary may
-        raise a RuntimeError or fail to iterate over all entries.
+        raise a `RuntimeError` or fail to iterate over all entries.
         """
         return iter(self._list)
     def __getitem__(self, index):
@@ -512,7 +543,7 @@ def __len__(self):
         return len(self._dict)
     def __contains__(self, value):
         """
-        Return True if and only if *value* is on the underlying dictionary's
+        Return True if and only if *value* is in the underlying Mapping's
         values.
         """
         return value in self._view
@@ -565,7 +596,7 @@ def count(self, value):
     else:
         def count(self, value):
             """Return the number of occurrences of *value* in self."""
-            return sum(1 for val in _dict.values() if val == value)
+            return sum(1 for val in self._dict.values() if val == value)
     def __lt__(self, that):
         raise TypeError
     def __gt__(self, that):
@@ -629,7 +660,7 @@ def __iter__(self):
         over in their sorted order.
 
         Iterating views while adding or deleting entries in the dictionary may
-        raise a RuntimeError or fail to iterate over all entries.
+        raise a `RuntimeError` or fail to iterate over all entries.
         """
         _dict = self._dict
         return iter((key, _dict[key]) for key in self._list)