Merge pull request #15 from LokkiDog/master

Python/Django compatibility with backward-compatible
nnseva · May 22, 2023 · ac0bf4f · ac0bf4f
2 parents b1dbd5a + 084cad5
commit ac0bf4f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/access/__init__.py b/access/__init__.py
@@ -1 +1 @@
-__version__ = "0.1.1b1"
+__version__ = "0.1.1b2"
diff --git a/access/admin.py b/access/admin.py
@@ -45,7 +45,10 @@
 
 from access.managers import AccessManager
 
-import collections
+try:
+ from collections import Iterable
+except ImportError:
+ from collections.abc import Iterable
 
 
 def list_union(l1, l2):
@@ -253,7 +256,7 @@ def save_model(self, request, obj, form, change):
  if fieldname.endswith("_set"):
  fieldname = fieldname[:-4]
  field = form.instance._meta.get_field(fieldname)
- if isinstance(v, collections.Iterable) and not isinstance(v, string_types) and isinstance(field, ForeignObjectRel):
+ if isinstance(v, Iterable) and not isinstance(v, string_types) and isinstance(field, ForeignObjectRel):
  continue
  if getattr(obj, k) is None:
  setattr(obj, k, v)
@@ -271,7 +274,7 @@ def save_related(self, request, form, formsets, change):
  if fieldname.endswith("_set"):
  fieldname = fieldname[:-4]
  field = form.instance._meta.get_field(fieldname)
- if isinstance(v, collections.Iterable) and not isinstance(v, string_types) and isinstance(field, ForeignObjectRel):
+ if isinstance(v, Iterable) and not isinstance(v, string_types) and isinstance(field, ForeignObjectRel):
  fld = getattr(form.instance, k)
  for i in v:
  fld.add(i)