Skip to content

D
django-wiki
Commit 1baf410f by Russell Jones Committed by benjaoming
Options

Try to work around (necessary) absence of force_unicode in Django on python 3

parent 6be734fe
Showing with 10 additions and 2 deletions
wiki/editors/markitup.py
from django import forms from django import forms
from django.forms.util import flatatt from django.forms.util import flatatt
from django.utils.encoding import force_unicode try:
from django.utils.encoding import force_unicode
except ImportError:
def force_unicode(x):
return(x)
from django.utils.html import conditional_escape from django.utils.html import conditional_escape
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
......
wiki/forms.py
...@@ -9,7 +9,11 @@ from django import forms ...@@ -9,7 +9,11 @@ from django import forms
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.forms.util import flatatt from django.forms.util import flatatt
from django.utils.encoding import force_unicode try:
from django.utils.encoding import force_unicode
except ImportError:
def force_unicode(x):
return(x)
from django.utils.html import escape, conditional_escape from django.utils.html import escape, conditional_escape
from itertools import chain from itertools import chain
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment