Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: master
...
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 1 commit
  • 1 file changed
  • 1 commit comment
  • 1 contributor
Showing with 5 additions and 1 deletion.
  1. +5 −1 tinymce/widgets.py
View
6 tinymce/widgets.py
@@ -11,7 +11,11 @@
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
+#for compatibility import with Django 1.2
+try:
+ from django.forms.util import smart_unicode
+except ImportError:
+ from django.utils.encoding import smart_unicode
from django.utils.html import escape
from django.utils import simplejson
from django.utils.datastructures import SortedDict

Showing you all comments on commits in this comparison.

@luxumbra

Great. Thanks for this.

Something went wrong with that request. Please try again.