Forráskód Böngészése

adapt latest Django version

WeizhongTu 2 éve
szülő
commit
614a7da53a

+ 1 - 1
DjangoUeditor/commands.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from . import settings as USettings
-from django.utils.six.moves.urllib.parse import urljoin
+from six.moves.urllib.parse import urljoin
 
 
 class UEditorEventHandler(object):

+ 1 - 1
DjangoUeditor/forms.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django import forms
-from widgets import UEditorWidget
+from DjangoUeditor.widgets import UEditorWidget
 from DjangoUeditor.models import UEditorField as ModelUEditorField
 
 

+ 4 - 1
DjangoUeditor/urls.py

@@ -6,7 +6,10 @@ DJANGO_VERSION = django.VERSION[:2]
 
 
 if DJANGO_VERSION >= (1, 8):
-    from django.conf.urls import url
+    try:
+        from django.urls import re_path as url
+    except ImportError:
+        from django.conf.urls import url
     urlpatterns = [
         url(r'^controller/$', get_ueditor_controller)
     ]

+ 1 - 1
DjangoUeditor/utils.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # 文件大小类
-from django.utils import six
+import six
 
 if six.PY3:
     long = int

+ 3 - 3
DjangoUeditor/views.py

@@ -7,10 +7,10 @@ import json
 from django.views.decorators.csrf import csrf_exempt
 import datetime
 import random
-from django.utils import six
+import six
 
-from django.utils.six.moves.urllib.request import urlopen
-from django.utils.six.moves.urllib.parse import urljoin
+from six.moves.urllib.request import urlopen
+from six.moves.urllib.parse import urljoin
 
 
 if six.PY3:

+ 1 - 1
DjangoUeditor/widgets.py

@@ -7,7 +7,7 @@ from django.utils.safestring import mark_safe
 from django.utils.http import urlencode
 from . import settings as USettings
 from .commands import *
-from django.utils.six import string_types
+from six import string_types
 
 
 # 修正输入的文件路径,输入路径的标准格式:abc,不需要前后置的路径符号

+ 4 - 0
readme.md

@@ -3,6 +3,10 @@ Ueditor HTML编辑器是百度开源的在线HTML编辑器,功能非常强大,
 
 更新历史
 ============
+###[2023-7-22]     Ver:1.9.143
+
+* Fix: 适配Django2.2以上版本,包含当前最新的4.2
+
 ###[2015-1-17]     Ver:1.9.143
 
 * Fix:当models.py中toolbars变量使用unicode字符时,编辑器无法加载的问题