CPLAT-4620 patch to use collections.abc in python3

sendbird · Nov 12, 2024 · 3e8d627 · 3e8d627
1 parent 10f2cd3
commit 3e8d627
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/django/core/paginator.py b/django/core/paginator.py
@@ -121,9 +121,12 @@ def _check_object_list_is_ordered(self):
 
 
 QuerySetPaginator = Paginator   # For backwards-compatibility.
+try:
+    from collections.abc import Sequence
+except ImportError:
+    from collections import Sequence
 
-
-class Page(collections.Sequence):
+class Page(Sequence):
 
     def __init__(self, object_list, number, paginator):
         self.object_list = object_list

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
@@ -8,7 +8,13 @@
 """
 import copy
 import warnings
-from collections import Counter, Iterator, Mapping, OrderedDict
+from collections import Counter, OrderedDict
+try:
+    from collections.abc import Iterable
+    from collections.abc import MutableMapping
+except ImportError:
+    from collections import Iterable
+    from collections import MutableMapping
 from itertools import chain, count, product
 from string import ascii_uppercase