From be659a9df5ba9b5720cae8f4418a09bde4901fe4 Mon Sep 17 00:00:00 2001 From: Jonathan Liuti Date: Sun, 25 May 2014 16:12:04 +0200 Subject: [PATCH] Use force_text for django 1.5+ on yakky's recommendation --- djangocms_text_ckeditor/models.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/djangocms_text_ckeditor/models.py b/djangocms_text_ckeditor/models.py index be7777c..1025a5d 100644 --- a/djangocms_text_ckeditor/models.py +++ b/djangocms_text_ckeditor/models.py @@ -1,6 +1,11 @@ import re import sys +try: + from django.utils.encoding import force_text as force_unicode_or_text +except ImportError: + from django.utils.encoding import force_unicode as force_unicode_or_text + from django.utils.encoding import force_unicode from django.db import models from django.utils.html import strip_tags @@ -28,7 +33,7 @@ class AbstractText(CMSPlugin): def __init__(self, *args, **kwargs): super(AbstractText, self).__init__(*args, **kwargs) - self.body = force_unicode(self.body) + self.body = force_unicode_or_text(self.body) def save(self, *args, **kwargs): body = self.body