Merge branch 'master' into add-typeshed-types

Author: Avasam

boltons/listutils.py

@@ -316,7 +316,7 @@ def sort(self) -> None:
                 li.sort()
             tmp_sorted = sorted(chain.from_iterable(self.lists))
             del self.lists[:]
-            self.lists[0] = tmp_sorted
+            self.lists.append(tmp_sorted)
             self._balance_list(0)
 
     def reverse(self) -> None:

tests/test_listutils.py

@@ -51,6 +51,14 @@ def test_barrel_list():
     bl3[:20:2] = range(0, -10, -1)
     assert bl3[6] == -3  # some truly tricky stepping/slicing works
 
+def test_sort_barrel_list():
+    bl = BarrelList(reversed(range(100000)))
+    bl.pop(50000)
+    assert len(bl.lists) > 1
+    bl.sort()
+    assert bl[0] == 0
+    assert bl[-1] == 99999
+
 # roughly increasing random integers
 # [ord(i) * x for i, x in zip(os.urandom(1024), range(1024))]
 TEST_INTS = [0, 74, 96, 183, 456, 150, 1098, 665, 1752, 1053, 190,