From f8700bf1470ce3d866e24f0bea251208ea4dd7c8 Mon Sep 17 00:00:00 2001
From: Mateusz Marzantowicz <mmarzantowicz@osdf.com.pl>
Date: Thu, 31 Jul 2014 15:07:40 +0200
Subject: [PATCH] django.utils.six supports urlib since 1.5 - we need to do
 imports the old way

---
 djangocms_text_ckeditor/cms_plugins.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/djangocms_text_ckeditor/cms_plugins.py b/djangocms_text_ckeditor/cms_plugins.py
index 1c4ba45..4370215 100644
--- a/djangocms_text_ckeditor/cms_plugins.py
+++ b/djangocms_text_ckeditor/cms_plugins.py
@@ -1,6 +1,5 @@
 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 _
 
 from cms import __version__ as cms_version
@@ -13,6 +12,11 @@ from .models import Text
 from .utils import plugin_tags_to_user_html
 from .forms import TextForm
 
+try:
+    from urlparse import urljoin
+except ImportError:
+    from urllib.parse import urljoin
+
 
 class TextPlugin(CMSPluginBase):
     model = Text