Skip to content

Commit d933ee4

Browse files
committed
Added backwards compatibility for md5_constructor and truncate_html_words
1 parent 93522ab commit d933ee4

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

askbot/models/post.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from django.core import urlresolvers
1111
from django.db import models
1212
from django.utils import html as html_utils
13-
from django.utils.text import truncate_html_words
1413
from django.utils.translation import activate as activate_language
1514
from django.utils.translation import get_language
1615
from django.utils.translation import ugettext as _
@@ -77,6 +76,18 @@ def default_html_moderator(post):
7776

7877
return post.html
7978

79+
def truncate_html_words(value, num_words):
80+
"""Backwords compatibility shim."""
81+
try:
82+
# Django 1.4+
83+
from django.utils.text import Truncator
84+
except ImportError:
85+
# Django 1.3
86+
from django.utils.text import truncate_html_words
87+
return truncate_html_words(value, num_words)
88+
else:
89+
return Truncator(value).words(num_words, html=True)
90+
8091

8192
class PostToGroup(models.Model):
8293
post = models.ForeignKey('Post')

askbot/models/question.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
from django.core.urlresolvers import reverse
1414
from django.template.loader import get_template
1515
from django.template import Context
16-
from django.utils.hashcompat import md5_constructor
16+
try:
17+
from django.utils.hashcompat import md5_constructor
18+
except ImportError:
19+
import hashlib
20+
md5_constructor = hashlib.md5
1721
from django.utils.translation import ugettext as _
1822
from django.utils.translation import ungettext
1923
from django.utils.translation import string_concat

0 commit comments

Comments
 (0)