Stopped reversing views by string (reverse or url calls)

Refs #49. This prevents some deprecation warnings on Django 1.9.

@@ -70,7 +70,7 @@ def get_form_target():
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form_target"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_form_target"):
         return get_comment_app().get_form_target()
         return get_comment_app().get_form_target()
     else:
     else:
-        return urlresolvers.reverse("django_comments.views.comments.post_comment")
+        return urlresolvers.reverse("comments-post-comment")
 
 
 
 
 def get_flag_url(comment):
 def get_flag_url(comment):
@@ -80,8 +80,7 @@ def get_flag_url(comment):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_flag_url"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_flag_url"):
         return get_comment_app().get_flag_url(comment)
         return get_comment_app().get_flag_url(comment)
     else:
     else:
-        return urlresolvers.reverse("django_comments.views.moderation.flag",
-                                    args=(comment.id,))
+        return urlresolvers.reverse("comments-flag", args=(comment.id,))
 
 
 
 
 def get_delete_url(comment):
 def get_delete_url(comment):
@@ -91,8 +90,7 @@ def get_delete_url(comment):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_delete_url"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_delete_url"):
         return get_comment_app().get_delete_url(comment)
         return get_comment_app().get_delete_url(comment)
     else:
     else:
-        return urlresolvers.reverse("django_comments.views.moderation.delete",
-                                    args=(comment.id,))
+        return urlresolvers.reverse("comments-delete", args=(comment.id,))
 
 
 
 
 def get_approve_url(comment):
 def get_approve_url(comment):
@@ -102,5 +100,4 @@ def get_approve_url(comment):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_approve_url"):
     if get_comment_app_name() != DEFAULT_COMMENTS_APP and hasattr(get_comment_app(), "get_approve_url"):
         return get_comment_app().get_approve_url(comment)
         return get_comment_app().get_approve_url(comment)
     else:
     else:
-        return urlresolvers.reverse("django_comments.views.moderation.approve",
-                                    args=(comment.id,))
+        return urlresolvers.reverse("comments-approve", args=(comment.id,))

 from django.conf.urls import patterns, url
 from django.conf.urls import patterns, url
+from django.contrib.contenttypes.views import shortcut
 
 
-urlpatterns = patterns('django_comments.views',
-    url(r'^post/$', 'comments.post_comment', name='comments-post-comment'),
-    url(r'^posted/$', 'comments.comment_done', name='comments-comment-done'),
-    url(r'^flag/(\d+)/$', 'moderation.flag', name='comments-flag'),
-    url(r'^flagged/$', 'moderation.flag_done', name='comments-flag-done'),
-    url(r'^delete/(\d+)/$', 'moderation.delete', name='comments-delete'),
-    url(r'^deleted/$', 'moderation.delete_done', name='comments-delete-done'),
-    url(r'^approve/(\d+)/$', 'moderation.approve', name='comments-approve'),
-    url(r'^approved/$', 'moderation.approve_done', name='comments-approve-done'),
+from .views.comments import post_comment, comment_done
+from .views.moderation import (
+    flag, flag_done, delete, delete_done, approve, approve_done,
+)
+
+
+urlpatterns = patterns('',
+    url(r'^post/$', post_comment, name='comments-post-comment'),
+    url(r'^posted/$', comment_done, name='comments-comment-done'),
+    url(r'^flag/(\d+)/$', flag, name='comments-flag'),
+    url(r'^flagged/$', flag_done, name='comments-flag-done'),
+    url(r'^delete/(\d+)/$', delete, name='comments-delete'),
+    url(r'^deleted/$', delete_done, name='comments-delete-done'),
+    url(r'^approve/(\d+)/$', approve, name='comments-approve'),
+    url(r'^approved/$', approve_done, name='comments-approve-done'),
 )
 )
 
 
 urlpatterns += patterns('',
 urlpatterns += patterns('',
-    url(r'^cr/(\d+)/(.+)/$', 'django.contrib.contenttypes.views.shortcut',
+    url(r'^cr/(\d+)/(.+)/$', shortcut,
         name='comments-url-redirect'),
         name='comments-url-redirect'),
 )
 )

 from django.core import urlresolvers
 from django.core import urlresolvers
+
+from . import views
 from .forms import CustomCommentForm
 from .forms import CustomCommentForm
 
 
 
 
@@ -12,27 +14,16 @@ def get_form():
 
 
 
 
 def get_form_target():
 def get_form_target():
-    return urlresolvers.reverse(
-        "custom_comments.views.custom_submit_comment"
-    )
+    return urlresolvers.reverse(views.custom_submit_comment)
 
 
 
 
 def get_flag_url(c):
 def get_flag_url(c):
-    return urlresolvers.reverse(
-        "custom_comments.views.custom_flag_comment",
-        args=(c.id,)
-    )
+    return urlresolvers.reverse(views.custom_flag_comment, args=(c.id,))
 
 
 
 
 def get_delete_url(c):
 def get_delete_url(c):
-    return urlresolvers.reverse(
-        "custom_comments.views.custom_delete_comment",
-        args=(c.id,)
-    )
+    return urlresolvers.reverse(views.custom_delete_comment, args=(c.id,))
 
 
 
 
 def get_approve_url(c):
 def get_approve_url(c):
-    return urlresolvers.reverse(
-        "custom_comments.views.custom_approve_comment",
-        args=(c.id,)
-    )
+    return urlresolvers.reverse(views.custom_approve_comment, args=(c.id,))

 from __future__ import absolute_import
 from __future__ import absolute_import
 
 
 from django.conf.urls import patterns, url
 from django.conf.urls import patterns, url
+from django.contrib.contenttypes.views import shortcut
 
 
 from django_comments.feeds import LatestCommentFeed
 from django_comments.feeds import LatestCommentFeed
 
 
@@ -16,7 +17,7 @@ urlpatterns = patterns('',
     url(r'^flag/(\d+)/$', views.custom_flag_comment),
     url(r'^flag/(\d+)/$', views.custom_flag_comment),
     url(r'^delete/(\d+)/$', views.custom_delete_comment),
     url(r'^delete/(\d+)/$', views.custom_delete_comment),
     url(r'^approve/(\d+)/$', views.custom_approve_comment),
     url(r'^approve/(\d+)/$', views.custom_approve_comment),
-    url(r'^cr/(\d+)/(.+)/$', 'django.contrib.contenttypes.views.shortcut', name='comments-url-redirect'),
+    url(r'^cr/(\d+)/(.+)/$', shortcut, name='comments-url-redirect'),
 )
 )
 
 
 urlpatterns += patterns('',
 urlpatterns += patterns('',

 from django.conf.urls import patterns, include
 from django.conf.urls import patterns, include
+from django.contrib.auth.views import login, logout
+
 
 
 urlpatterns = patterns('',
 urlpatterns = patterns('',
     (r'^', include('django_comments.urls')),
     (r'^', include('django_comments.urls')),
 
 
     # Provide the auth system login and logout views
     # Provide the auth system login and logout views
-    (r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
-    (r'^accounts/logout/$', 'django.contrib.auth.views.logout'),
+    (r'^accounts/login/$', login, {'template_name': 'login.html'}),
+    (r'^accounts/logout/$', logout),
 )
 )