Merge pull request #144 from mmarzantowicz/feature/django-utils-six
Make use of django.utils.six
This commit is contained in:
commit
a61a5b48e1
|
@ -1,10 +1,7 @@
|
|||
from django.conf import settings
|
||||
from django.forms.fields import CharField
|
||||
from django.utils.six.moves.urllib.parse import urljoin
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
try:
|
||||
from urlparse import urljoin
|
||||
except ImportError:
|
||||
from urllib.parse import urljoin
|
||||
|
||||
from cms import __version__ as cms_version
|
||||
from cms.plugin_base import CMSPluginBase
|
||||
|
|
|
@ -2,14 +2,12 @@
|
|||
import base64
|
||||
from html5lib import sanitizer, serializer, treebuilders, treewalkers
|
||||
import html5lib
|
||||
try:
|
||||
from io import BytesIO as StringIO
|
||||
except ImportError:
|
||||
from StringIO import StringIO
|
||||
from PIL import Image
|
||||
import re
|
||||
import uuid
|
||||
|
||||
from django.utils.six import StringIO
|
||||
|
||||
from .settings import (TEXT_SAVE_IMAGE_FUNCTION, TEXT_ADDITIONAL_TAGS,
|
||||
TEXT_ADDITIONAL_ATTRIBUTES, TEXT_HTML_SANITIZE)
|
||||
from .utils import plugin_to_tag
|
||||
|
|
Reference in New Issue