From fd1d8d1f008077aec083db5caf1a1aee369a2916 Mon Sep 17 00:00:00 2001 From: Mateusz Marzantowicz Date: Thu, 19 Jun 2014 17:52:37 +0200 Subject: [PATCH 1/2] Import urljoin from django.utils.six.moves --- djangocms_text_ckeditor/cms_plugins.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/djangocms_text_ckeditor/cms_plugins.py b/djangocms_text_ckeditor/cms_plugins.py index 0b24d1d..5e35272 100644 --- a/djangocms_text_ckeditor/cms_plugins.py +++ b/djangocms_text_ckeditor/cms_plugins.py @@ -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 From b6fb880aed50f348756ba0d1cd50f9d6115074b7 Mon Sep 17 00:00:00 2001 From: Mateusz Marzantowicz Date: Thu, 19 Jun 2014 17:55:55 +0200 Subject: [PATCH 2/2] Import StringIO from django.utils.six.moves --- djangocms_text_ckeditor/html.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/djangocms_text_ckeditor/html.py b/djangocms_text_ckeditor/html.py index 4641245..4dfea0a 100644 --- a/djangocms_text_ckeditor/html.py +++ b/djangocms_text_ckeditor/html.py @@ -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