浏览代码

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

ayush.goyal 4 年之前
父节点
当前提交
5b4ca5da2c
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      desktop/core/src/desktop/lib/django_forms.py

+ 2 - 2
desktop/core/src/desktop/lib/django_forms.py

@@ -33,7 +33,7 @@ from django.forms.fields import MultiValueField, CharField, ChoiceField, Boolean
 from django.forms.widgets import MultiWidget, Select, TextInput, Textarea, HiddenInput, Input
 from django.forms.widgets import MultiWidget, Select, TextInput, Textarea, HiddenInput, Input
 from django.utils import formats
 from django.utils import formats
 from django.utils.safestring import mark_safe
 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
 import desktop.lib.i18n
 from desktop.lib.i18n import smart_str
 from desktop.lib.i18n import smart_str
@@ -51,7 +51,7 @@ LOG = logging.getLogger(__name__)
 try:
 try:
   from django.utils.encoding import StrAndUnicode
   from django.utils.encoding import StrAndUnicode
 except ImportError:
 except ImportError:
-  from django.utils.encoding import python_2_unicode_compatible
+  from six import python_2_unicode_compatible
 
 
   @python_2_unicode_compatible
   @python_2_unicode_compatible
   class StrAndUnicode(object):
   class StrAndUnicode(object):