Merge pull request #88 from yeago/master

inspect comment class differently

@@ -40,13 +40,13 @@ def get_comment_app_name():
 
 
 
 
 def get_model():
 def get_model():
-    from django_comments.models import Comment
     """
     """
     Returns the comment model class.
     Returns the comment model class.
     """
     """
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_model"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_model"):
         return get_comment_app().get_model()
         return get_comment_app().get_model()
     else:
     else:
+        from django_comments.models import Comment
         return Comment
         return Comment
 
 
 
 

@@ -4,7 +4,6 @@ from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext_lazy as _, ungettext
 from django.utils.translation import ugettext_lazy as _, ungettext
 
 
-from django_comments.models import Comment
 from django_comments import get_model
 from django_comments import get_model
 from django_comments.views.moderation import perform_flag, perform_approve, perform_delete
 from django_comments.views.moderation import perform_flag, perform_approve, perform_delete
 
 
@@ -90,5 +89,6 @@ class CommentsAdmin(admin.ModelAdmin):
 
 
 # Only register the default admin if the model is the built-in comment model
 # Only register the default admin if the model is the built-in comment model
 # (this won't be true if there's a custom comment app).
 # (this won't be true if there's a custom comment app).
-if get_model() is Comment:
-    admin.site.register(Comment, CommentsAdmin)
+Klass = get_model()
+if Klass._meta.app_label is "django_comments":
+    admin.site.register(Klass, CommentsAdmin)