Commit ad2a4ed8dfe61176b4233484c52428fa93618e76

Authored by Eric Man
Committed by Claude Paroz
1 parent d33696bb

Added Django 1.9+ support

1 from django.conf import settings 1 from django.conf import settings
2 from django.core import urlresolvers 2 from django.core import urlresolvers
3 from django.core.exceptions import ImproperlyConfigured 3 from django.core.exceptions import ImproperlyConfigured
4 -from django.utils.importlib import import_module  
5 4
6 -from django_comments.models import Comment  
7 -from django_comments.forms import CommentForm 5 +try:
  6 + from importlib import import_module
  7 +except ImportError:
  8 + from django.utils.importlib import import_module
  9 +
8 10
9 DEFAULT_COMMENTS_APP = 'django_comments' 11 DEFAULT_COMMENTS_APP = 'django_comments'
10 12
@@ -35,6 +37,7 @@ def get_comment_app_name(): @@ -35,6 +37,7 @@ def get_comment_app_name():
35 return getattr(settings, 'COMMENTS_APP', DEFAULT_COMMENTS_APP) 37 return getattr(settings, 'COMMENTS_APP', DEFAULT_COMMENTS_APP)
36 38
37 def get_model(): 39 def get_model():
  40 + from django_comments.models import Comment
38 """ 41 """
39 Returns the comment model class. 42 Returns the comment model class.
40 """ 43 """
@@ -44,6 +47,7 @@ def get_model(): @@ -44,6 +47,7 @@ def get_model():
44 return Comment 47 return Comment
45 48
46 def get_form(): 49 def get_form():
  50 + from django_comments.forms import CommentForm
47 """ 51 """
48 Returns the comment ModelForm class. 52 Returns the comment ModelForm class.
49 """ 53 """
1 import time 1 import time
2 from django import forms 2 from django import forms
3 -from django.forms.util import ErrorDict 3 +
  4 +try:
  5 + from django.forms.utils import ErrorDict
  6 +except ImportError:
  7 + from django.forms.util import ErrorDict
  8 +
4 from django.conf import settings 9 from django.conf import settings
5 from django.contrib.contenttypes.models import ContentType 10 from django.contrib.contenttypes.models import ContentType
6 from django.utils.crypto import salted_hmac, constant_time_compare 11 from django.utils.crypto import salted_hmac, constant_time_compare
1 from django.conf import settings 1 from django.conf import settings
2 -from django.contrib.contenttypes import generic 2 +
  3 +try:
  4 + from django.contrib.contenttypes.fields import GenericForeignKey
  5 +except ImportError:
  6 + from django.contrib.contenttypes.generic import GenericForeignKey
  7 +
3 from django.contrib.contenttypes.models import ContentType 8 from django.contrib.contenttypes.models import ContentType
4 from django.contrib.sites.models import Site 9 from django.contrib.sites.models import Site
5 from django.core import urlresolvers 10 from django.core import urlresolvers
@@ -24,7 +29,7 @@ class BaseCommentAbstractModel(models.Model): @@ -24,7 +29,7 @@ class BaseCommentAbstractModel(models.Model):
24 verbose_name=_('content type'), 29 verbose_name=_('content type'),
25 related_name="content_type_set_for_%(class)s") 30 related_name="content_type_set_for_%(class)s")
26 object_pk = models.TextField(_('object ID')) 31 object_pk = models.TextField(_('object ID'))
27 - content_object = generic.GenericForeignKey(ct_field="content_type", fk_field="object_pk") 32 + content_object = GenericForeignKey(ct_field="content_type", fk_field="object_pk")
28 33
29 # Metadata about the comment 34 # Metadata about the comment
30 site = models.ForeignKey(Site) 35 site = models.ForeignKey(Site)
Please register or login to post a comment