Merge pull request #12004 from tirkarthi/fix-warnings

fix: Import ABC from collections.abc for Python 3.9 compatibility.

frappe/chat/util/util.py

@@ -1,27 +1,21 @@
 from __future__ import unicode_literals
 
-# imports - third-party imports
-import requests
-
-# imports - compatibility imports
-import six
-
 # imports - standard imports
-from   collections import Sequence, MutableSequence, Mapping, MutableMapping
-if six.PY2:
-	from urlparse import urlparse 	  # PY2
-else:
-	from urllib.parse import urlparse # PY3
 import json
+from collections.abc import MutableMapping, MutableSequence, Sequence
+
+# imports - third-party imports
+import requests
+from urllib.parse import urlparse
 
 # imports - module imports
-from   frappe.model.document import Document
-from   frappe.exceptions import DuplicateEntryError
-from   frappe import _dict
 import frappe
+from frappe.exceptions import DuplicateEntryError
+from frappe.model.document import Document
 
 session = frappe.session
 
+
 def get_user_doc(user = None):
 	if isinstance(user, Document):
 		return user
@@ -38,12 +32,12 @@ def squashify(what):
 	return what
 
 def safe_json_loads(*args):
-	results = [ ]
+	results = []
 
 	for arg in args:
 		try:
 			arg = json.loads(arg)
-		except Exception as e:
+		except Exception:
 			pass
 
 		results.append(arg)
@@ -81,7 +75,7 @@ def dictify(arg):
 		for i, a in enumerate(arg):
 			arg[i] = dictify(a)
 	elif isinstance(arg, MutableMapping):
-		arg = _dict(arg)
+		arg = frappe._dict(arg)
 
 	return arg
 
@@ -113,4 +107,4 @@ def get_emojis():
 			emojis = resp.json()
 			redis.hset('frappe_emojis', 'emojis', emojis)
 
-	return dictify(emojis)
+	return dictify(emojis)

frappe/utils/response.py

@@ -123,7 +123,7 @@ def make_logs(response = None):
 def json_handler(obj):
 	"""serialize non-serializable data for json"""
 	# serialize date
-	import collections
+	import collections.abc
 
 	if isinstance(obj, (datetime.date, datetime.timedelta, datetime.datetime)):
 		return text_type(obj)
@@ -138,7 +138,7 @@ def json_handler(obj):
 		doc = obj.as_dict(no_nulls=True)
 		return doc
 
-	elif isinstance(obj, collections.Iterable):
+	elif isinstance(obj, collections.abc.Iterable):
 		return list(obj)
 
 	elif type(obj)==type or isinstance(obj, Exception):