python: Update bundled sortedcontainers to 2.4.0.

This is needed since the current bundled version doesn't work on Python 3.10+. Signed-off-by: Timothy Redaelli <[email protected]> Signed-off-by: Ilya Maximets <[email protected]>
jsoref · Jul 16, 2021 · 487253d · 487253d
1 parent 6c41bcb
commit 487253d
Show file tree

Hide file tree

Showing 5 changed files with 2,494 additions and 1,856 deletions.
diff --git a/python/ovs/compat/sortedcontainers/LICENSE b/python/ovs/compat/sortedcontainers/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2014-2016 Grant Jenks
+Copyright 2014-2019 Grant Jenks
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/python/ovs/compat/sortedcontainers/__init__.py b/python/ovs/compat/sortedcontainers/__init__.py
@@ -1,9 +1,8 @@
-"""Sorted Container Types: SortedList, SortedDict, SortedSet
+"""Sorted Containers -- Sorted List, Sorted Dict, Sorted Set
 
-SortedContainers is an Apache2 licensed containers library, written in
+Sorted Containers is an Apache2 licensed containers library, written in
 pure-Python, and fast as C-extensions.
 
-
 Python's standard library is great until you need a sorted collections
 type. Many will attest that you can get really far without one, but the moment
 you **really need** a sorted list, dict, or set, you're faced with a dozen
@@ -14,39 +13,62 @@
 
 ::
 
-    >>> from sortedcontainers import SortedList, SortedDict, SortedSet
-    >>> sl = SortedList(xrange(10000000))
-    >>> 1234567 in sl
-    True
-    >>> sl[7654321]
-    7654321
-    >>> sl.add(1234567)
-    >>> sl.count(1234567)
+    >>> from sortedcontainers import SortedList
+    >>> sl = SortedList(['e', 'a', 'c', 'd', 'b'])
+    >>> sl
+    SortedList(['a', 'b', 'c', 'd', 'e'])
+    >>> sl *= 1000000
+    >>> sl.count('c')
+    1000000
+    >>> sl[-3:]
+    ['e', 'e', 'e']
+    >>> from sortedcontainers import SortedDict
+    >>> sd = SortedDict({'c': 3, 'a': 1, 'b': 2})
+    >>> sd
+    SortedDict({'a': 1, 'b': 2, 'c': 3})
+    >>> sd.popitem(index=-1)
+    ('c', 3)
+    >>> from sortedcontainers import SortedSet
+    >>> ss = SortedSet('abracadabra')
+    >>> ss
+    SortedSet(['a', 'b', 'c', 'd', 'r'])
+    >>> ss.bisect_left('c')
     2
-    >>> sl *= 3
-    >>> len(sl)
-    30000003
 
-SortedContainers takes all of the work out of Python sorted types - making your
-deployment and use of Python easy. There's no need to install a C compiler or
-pre-build and distribute custom extensions. Performance is a feature and
+Sorted Containers takes all of the work out of Python sorted types - making
+your deployment and use of Python easy. There's no need to install a C compiler
+or pre-build and distribute custom extensions. Performance is a feature and
 testing has 100% coverage with unit tests and hours of stress.
 
-:copyright: (c) 2016 by Grant Jenks.
+:copyright: (c) 2014-2019 by Grant Jenks.
 :license: Apache 2.0, see LICENSE for more details.
 
 """
 
 
-from .sortedlist import SortedList, SortedListWithKey
+from .sortedlist import SortedList, SortedKeyList, SortedListWithKey
 from .sortedset import SortedSet
-from .sorteddict import SortedDict
+from .sorteddict import (
+    SortedDict,
+    SortedKeysView,
+    SortedItemsView,
+    SortedValuesView,
+)
 
-__all__ = ['SortedList', 'SortedSet', 'SortedDict', 'SortedListWithKey']
+__all__ = [
+    'SortedList',
+    'SortedKeyList',
+    'SortedListWithKey',
+    'SortedDict',
+    'SortedKeysView',
+    'SortedItemsView',
+    'SortedValuesView',
+    'SortedSet',
+]
 
 __title__ = 'sortedcontainers'
-__version__ = '1.5.9'
-__build__ = 0x010509
+__version__ = '2.4.0'
+__build__ = 0x020400
 __author__ = 'Grant Jenks'
 __license__ = 'Apache 2.0'
-__copyright__ = 'Copyright 2016 Grant Jenks'
+__copyright__ = '2014-2019, Grant Jenks'