[Django 3.0] ImportError: cannot import name 'python_2_unicode_compatible' from 'django.utils.encoding'

Author: agl29

desktop/core/src/desktop/lib/django_forms.py

@@ -33,7 +33,7 @@
 from django.forms.widgets import MultiWidget, Select, TextInput, Textarea, HiddenInput, Input
 from django.utils import formats
 from django.utils.safestring import mark_safe
-from django.utils.encoding import python_2_unicode_compatible
+from six import python_2_unicode_compatible
 
 import desktop.lib.i18n
 from desktop.lib.i18n import smart_str
@@ -51,7 +51,7 @@
 try:
   from django.utils.encoding import StrAndUnicode
 except ImportError:
-  from django.utils.encoding import python_2_unicode_compatible
+  from six import python_2_unicode_compatible
 
   @python_2_unicode_compatible
   class StrAndUnicode(object):