1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
Description: Fix import error with Django 1.2.
Bug: http://code.google.com/p/django-tinymce/issues/detail?id=63
Bug-Debian: http://bugs.debian.org/587073
Origin: upstream, http://code.google.com/p/django-tinymce/source/detail?r=96
--- a/tinymce/widgets.py
+++ b/tinymce/widgets.py
@@ -11,7 +11,10 @@
from django.contrib.admin import widgets as admin_widgets
from django.core.urlresolvers import reverse
from django.forms.widgets import flatatt
-from django.forms.util import smart_unicode
+try:
+ from django.utils.encoding import smart_unicode
+except ImportError:
+ from django.forms.util import smart_unicode
from django.utils.html import escape
from django.utils import simplejson
from django.utils.datastructures import SortedDict
|
