Skip to content

Commit

Permalink
Merge pull request #25 from evidens/develop
Browse files Browse the repository at this point in the history
Patching use of deprecated django.utils.simplejson
  • Loading branch information
klen committed Feb 21, 2014
2 parents a45dbe2 + 0412d3f commit 07e589c
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions django_markdown/widgets.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
from django import forms
from django.conf import settings
from django.core.urlresolvers import reverse
from django.utils import simplejson
from django.utils.safestring import mark_safe

try:
import json as simplejson
except ImportError:
try:
import simplejson
except ImportError:
from django.utils import simplejson

class MarkdownWidget(forms.Textarea):

Expand Down

0 comments on commit 07e589c

Please sign in to comment.