Some more work to get tests running. Failing, but running.

 *.pyc
+*.egg-info

-Metadata-Version: 1.1
-Name: django-contrib.comments
-Version: 1.5
-Summary: The code formally known as django.contrib.comments.
-Home-page: http://github.com/django/django-contrib-comments
-Author: Django Software Foundation
-Author-email: jacob@jacobian.org
-License: BSD
-Description: UNKNOWN
-Platform: any
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Framework :: Django
-Classifier: Intended Audience :: Developers
-Classifier: Natural Language :: English
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.2
-Classifier: Programming Language :: Python :: 3.3

-README.txt
-setup.py
-django_comments/__init__.py
-django_comments/admin.py
-django_comments/feeds.py
-django_comments/forms.py
-django_comments/managers.py
-django_comments/models.py
-django_comments/moderation.py
-django_comments/signals.py
-django_comments/urls.py
-django_comments/templatetags/__init__.py
-django_comments/templatetags/comments.py
-django_comments/views/__init__.py
-django_comments/views/comments.py
-django_comments/views/moderation.py
-django_comments/views/utils.py
-django_contrib.comments.egg-info/PKG-INFO
-django_contrib.comments.egg-info/SOURCES.txt
-django_contrib.comments.egg-info/dependency_links.txt
-django_contrib.comments.egg-info/top_level.txt
-tests/custom_comments/__init__.py
-tests/custom_comments/forms.py
-tests/custom_comments/models.py
-tests/custom_comments/views.py
\ No newline at end of file

-

-tests
-django_comments

 from django.core import urlresolvers
-from comment_tests.custom_comments.models import CustomComment
-from comment_tests.custom_comments.forms import CustomCommentForm
+from .models import CustomComment
+from .forms import CustomCommentForm
 
 def get_model():
     return CustomComment
@@ -10,23 +10,23 @@ def get_form():
 
 def get_form_target():
     return urlresolvers.reverse(
-        "comment_tests.custom_comments.views.custom_submit_comment"
+        "custom_comments.views.custom_submit_comment"
     )
 
 def get_flag_url(c):
     return urlresolvers.reverse(
-        "comment_tests.custom_comments.views.custom_flag_comment",
+        "custom_comments.views.custom_flag_comment",
         args=(c.id,)
     )
 
 def get_delete_url(c):
     return urlresolvers.reverse(
-        "comment_tests.custom_comments.views.custom_delete_comment",
+        "custom_comments.views.custom_delete_comment",
         args=(c.id,)
     )
 
 def get_approve_url(c):
     return urlresolvers.reverse(
-        "comment_tests.custom_comments.views.custom_approve_comment",
+        "custom_comments.views.custom_approve_comment",
         args=(c.id,)
     )

@@ -14,8 +14,18 @@ sys.path[0:0] = [here, parent]
 from django.conf import settings
 settings.configure(
     DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3'}},
+    INSTALLED_APPS = [
+        "django.contrib.auth",
+        "django.contrib.contenttypes",
+        "django.contrib.sites",
+        "django.contrib.admin",
+        "django_comments",
+        "testapp",
+        "custom_comments",
+    ],
+    ROOT_URLCONF = 'testapp.urls',
     SECRET_KEY = "it's a secret to everyone",
-    INSTALLED_APPS = ["django_comments", "testapp", "custom_comments"],
+    SITE_ID = 1,
 )
 
 from django.test.simple import DjangoTestSuiteRunner

 [
   {
-    "model" : "comment_tests.book",
+    "model" : "testapp.book",
     "pk" : 1,
     "fields" : {
         "dewey_decimal" : "12.34"
     }
   },
   {
-    "model" : "comment_tests.author",
+    "model" : "testapp.author",
     "pk" : 1,
     "fields" : {
         "first_name" : "John",
@@ -15,7 +15,7 @@
     }
   },
   {
-    "model" : "comment_tests.author",
+    "model" : "testapp.author",
     "pk" : 2,
     "fields" : {
         "first_name" : "Peter",
@@ -23,7 +23,7 @@
     }
   },
   {
-    "model" : "comment_tests.article",
+    "model" : "testapp.article",
     "pk" : 1,
     "fields" : {
         "author" : 1,
@@ -31,7 +31,7 @@
     }
   },
   {
-    "model" : "comment_tests.article",
+    "model" : "testapp.article",
     "pk" : 2,
     "fields" : {
         "author" : 2,

 <?xml version="1.0" encoding="utf-8"?>
 <django-objects version="1.0">
-  <object pk="1" model="comment_tests.entry">
+  <object pk="1" model="testapp.entry">
       <field type="CharField" name="title">ABC</field>
       <field type="TextField" name="body">This is the body</field>
       <field type="DateField" name="pub_date">2008-01-01</field>
       <field type="BooleanField" name="enable_comments">True</field>
   </object>
-  <object pk="2" model="comment_tests.entry">
+  <object pk="2" model="testapp.entry">
       <field type="CharField" name="title">XYZ</field>
       <field type="TextField" name="body">Text here</field>
       <field type="DateField" name="pub_date">2008-01-02</field>

 from __future__ import absolute_import
 
 from django.contrib.auth.models import User
-from django.contrib.comments.forms import CommentForm
-from django.contrib.comments.models import Comment
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.test import TestCase
 from django.test.utils import override_settings
 
+from django_comments.forms import CommentForm
+from django_comments.models import Comment
+
 from ..models import Article, Author
 
 # Shortcut
@@ -17,7 +18,7 @@ CT = ContentType.objects.get_for_model
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',))
 class CommentTestCase(TestCase):
     fixtures = ["comment_tests"]
-    urls = 'comment_tests.urls_default'
+    urls = 'testapp.urls_default'
 
     def createSomeComments(self):
         # Two anonymous comments on two different objects
@@ -85,11 +86,11 @@ class CommentTestCase(TestCase):
         d.update(f.initial)
         return d
 
-from comment_tests.tests.app_api_tests import *
-from comment_tests.tests.feed_tests import *
-from comment_tests.tests.model_tests import *
-from comment_tests.tests.comment_form_tests import *
-from comment_tests.tests.templatetag_tests import *
-from comment_tests.tests.comment_view_tests import *
-from comment_tests.tests.moderation_view_tests import *
-from comment_tests.tests.comment_utils_moderators_tests import *
+from .app_api_tests import *
+from .feed_tests import *
+from .model_tests import *
+from .comment_form_tests import *
+from .templatetag_tests import *
+from .comment_view_tests import *
+from .moderation_view_tests import *
+from .comment_utils_moderators_tests import *

 from __future__ import absolute_import
 
 from django.conf import settings
-from django.contrib import comments
-from django.contrib.comments.models import Comment
-from django.contrib.comments.forms import CommentForm
 from django.core.exceptions import ImproperlyConfigured
 from django.test.utils import override_settings
 from django.utils import six
 
+import django_comments
+from django_comments.models import Comment
+from django_comments.forms import CommentForm
+
 from . import CommentTestCase
 
 
@@ -15,7 +16,7 @@ class CommentAppAPITests(CommentTestCase):
     """Tests for the "comment app" API"""
 
     def testGetCommentApp(self):
-        self.assertEqual(comments.get_comment_app(), comments)
+        self.assertEqual(django_comments.get_comment_app(), django_comments)
 
     @override_settings(
         COMMENTS_APP='missing_app',
@@ -23,58 +24,58 @@ class CommentAppAPITests(CommentTestCase):
     )
     def testGetMissingCommentApp(self):
         with six.assertRaisesRegex(self, ImproperlyConfigured, 'missing_app'):
-            _ = comments.get_comment_app()
+            _ = django_comments.get_comment_app()
 
     def testGetForm(self):
-        self.assertEqual(comments.get_form(), CommentForm)
+        self.assertEqual(django_comments.get_form(), CommentForm)
 
     def testGetFormTarget(self):
-        self.assertEqual(comments.get_form_target(), "/post/")
+        self.assertEqual(django_comments.get_form_target(), "/post/")
 
     def testGetFlagURL(self):
         c = Comment(id=12345)
-        self.assertEqual(comments.get_flag_url(c), "/flag/12345/")
+        self.assertEqual(django_comments.get_flag_url(c), "/flag/12345/")
 
     def getGetDeleteURL(self):
         c = Comment(id=12345)
-        self.assertEqual(comments.get_delete_url(c), "/delete/12345/")
+        self.assertEqual(django_comments.get_delete_url(c), "/delete/12345/")
 
     def getGetApproveURL(self):
         c = Comment(id=12345)
-        self.assertEqual(comments.get_approve_url(c), "/approve/12345/")
+        self.assertEqual(django_comments.get_approve_url(c), "/approve/12345/")
 
 
 @override_settings(
-    COMMENTS_APP='comment_tests.custom_comments',
+    COMMENTS_APP='custom_comments',
     INSTALLED_APPS=list(settings.INSTALLED_APPS) + [
-        'comment_tests.custom_comments'],
+        'custom_comments'],
 )
 class CustomCommentTest(CommentTestCase):
-    urls = 'comment_tests.urls'
+    urls = 'testapp.urls'
 
     def testGetCommentApp(self):
-        from comment_tests import custom_comments
-        self.assertEqual(comments.get_comment_app(), custom_comments)
+        import custom_comments
+        self.assertEqual(django_comments.get_comment_app(), custom_comments)
 
     def testGetModel(self):
-        from comment_tests.custom_comments.models import CustomComment
-        self.assertEqual(comments.get_model(), CustomComment)
+        from custom_comments.models import CustomComment
+        self.assertEqual(django_comments.get_model(), CustomComment)
 
     def testGetForm(self):
-        from comment_tests.custom_comments.forms import CustomCommentForm
-        self.assertEqual(comments.get_form(), CustomCommentForm)
+        from custom_comments.forms import CustomCommentForm
+        self.assertEqual(django_comments.get_form(), CustomCommentForm)
 
     def testGetFormTarget(self):
-        self.assertEqual(comments.get_form_target(), "/post/")
+        self.assertEqual(django_comments.get_form_target(), "/post/")
 
     def testGetFlagURL(self):
         c = Comment(id=12345)
-        self.assertEqual(comments.get_flag_url(c), "/flag/12345/")
+        self.assertEqual(django_comments.get_flag_url(c), "/flag/12345/")
 
     def getGetDeleteURL(self):
         c = Comment(id=12345)
-        self.assertEqual(comments.get_delete_url(c), "/delete/12345/")
+        self.assertEqual(django_comments.get_delete_url(c), "/delete/12345/")
 
     def getGetApproveURL(self):
         c = Comment(id=12345)
-        self.assertEqual(comments.get_approve_url(c), "/approve/12345/")
+        self.assertEqual(django_comments.get_approve_url(c), "/approve/12345/")

@@ -3,8 +3,9 @@ from __future__ import absolute_import
 import time
 
 from django.conf import settings
-from django.contrib.comments.forms import CommentForm
-from django.contrib.comments.models import Comment
+
+from django_comments.forms import CommentForm
+from django_comments.models import Comment
 
 from . import CommentTestCase
 from ..models import Article

 from __future__ import absolute_import
 
-from django.contrib.comments.models import Comment
-from django.contrib.comments.moderation import (moderator, CommentModerator,
-    AlreadyModerated)
 from django.core import mail
 
+from django_comments.models import Comment
+from django_comments.moderation import (moderator, CommentModerator,
+    AlreadyModerated)
+
 from . import CommentTestCase
 from ..models import Entry
 
@@ -94,4 +95,4 @@ class CommentUtilsModeratorTests(CommentTestCase):
     def testAutoCloseFieldImmediate(self):
         moderator.register(Entry, EntryModerator6)
         c1, c2 = self.createSomeComments()
-        self.assertEqual(Comment.objects.all().count(), 0)
\ No newline at end of file
+        self.assertEqual(Comment.objects.all().count(), 0)

@@ -4,8 +4,9 @@ import re
 
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.contrib.comments import signals
-from django.contrib.comments.models import Comment
+
+from django_comments import signals
+from django_comments.models import Comment
 
 from . import CommentTestCase
 from ..models import Article, Book

@@ -3,16 +3,17 @@ from __future__ import absolute_import
 from xml.etree import ElementTree as ET
 
 from django.conf import settings
-from django.contrib.comments.models import Comment
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 
+from django_comments.models import Comment
+
 from . import CommentTestCase
 from ..models import Article
 
 
 class CommentFeedTests(CommentTestCase):
-    urls = 'comment_tests.urls'
+    urls = 'testapp.urls'
     feed_url = '/rss/comments/'
 
     def setUp(self):

 from __future__ import absolute_import
 
-from django.contrib.comments.models import Comment
+from django_comments.models import Comment
 
 from . import CommentTestCase
 from ..models import Author, Article

 from __future__ import absolute_import, unicode_literals
 
 from django.contrib.auth.models import User, Permission
-from django.contrib.comments import signals
-from django.contrib.comments.models import Comment, CommentFlag
 from django.contrib.contenttypes.models import ContentType
 from django.utils import translation
 
+from django_comments import signals
+from django_comments.models import Comment, CommentFlag
+
 from . import CommentTestCase
 
 
@@ -252,7 +253,7 @@ class ApproveViewTests(CommentTestCase):
         self.assertTemplateUsed(response, "comments/approved.html")
 
 class AdminActionsTests(CommentTestCase):
-    urls = "comment_tests.urls_admin"
+    urls = "testapp.urls_admin"
 
     def setUp(self):
         super(AdminActionsTests, self).setUp()

 from __future__ import absolute_import
 
-from django.contrib.comments.forms import CommentForm
-from django.contrib.comments.models import Comment
 from django.contrib.contenttypes.models import ContentType
 from django.template import Template, Context, Library, libraries
 
+from django_comments.forms import CommentForm
+from django_comments.models import Comment
+
 from ..models import Article, Author
 from . import CommentTestCase
 
@@ -29,13 +30,13 @@ class CommentTemplateTagTests(CommentTestCase):
         self.assertEqual(out, "/post/")
 
     def testGetCommentForm(self, tag=None):
-        t = "{% load comments %}" + (tag or "{% get_comment_form for comment_tests.article a.id as form %}")
+        t = "{% load comments %}" + (tag or "{% get_comment_form for testapp.article a.id as form %}")
         ctx, out = self.render(t, a=Article.objects.get(pk=1))
         self.assertEqual(out, "")
         self.assertTrue(isinstance(ctx["form"], CommentForm))
 
     def testGetCommentFormFromLiteral(self):
-        self.testGetCommentForm("{% get_comment_form for comment_tests.article 1 as form %}")
+        self.testGetCommentForm("{% get_comment_form for testapp.article 1 as form %}")
 
     def testGetCommentFormFromObject(self):
         self.testGetCommentForm("{% get_comment_form for a as form %}")
@@ -44,13 +45,13 @@ class CommentTemplateTagTests(CommentTestCase):
         self.testGetCommentForm("{% load comment_testtags %}{% get_comment_form for a|noop:'x y' as form %}")
 
     def testRenderCommentForm(self, tag=None):
-        t = "{% load comments %}" + (tag or "{% render_comment_form for comment_tests.article a.id %}")
+        t = "{% load comments %}" + (tag or "{% render_comment_form for testapp.article a.id %}")
         ctx, out = self.render(t, a=Article.objects.get(pk=1))
         self.assertTrue(out.strip().startswith("<form action="))
         self.assertTrue(out.strip().endswith("</form>"))
 
     def testRenderCommentFormFromLiteral(self):
-        self.testRenderCommentForm("{% render_comment_form for comment_tests.article 1 %}")
+        self.testRenderCommentForm("{% render_comment_form for testapp.article 1 %}")
 
     def testRenderCommentFormFromObject(self):
         self.testRenderCommentForm("{% render_comment_form for a %}")
@@ -63,17 +64,17 @@ class CommentTemplateTagTests(CommentTestCase):
             self.testRenderCommentFormFromObject()
 
     def verifyGetCommentCount(self, tag=None):
-        t = "{% load comments %}" + (tag or "{% get_comment_count for comment_tests.article a.id as cc %}") + "{{ cc }}"
+        t = "{% load comments %}" + (tag or "{% get_comment_count for testapp.article a.id as cc %}") + "{{ cc }}"
         ctx, out = self.render(t, a=Article.objects.get(pk=1))
         self.assertEqual(out, "2")
 
     def testGetCommentCount(self):
         self.createSomeComments()
-        self.verifyGetCommentCount("{% get_comment_count for comment_tests.article a.id as cc %}")
+        self.verifyGetCommentCount("{% get_comment_count for testapp.article a.id as cc %}")
 
     def testGetCommentCountFromLiteral(self):
         self.createSomeComments()
-        self.verifyGetCommentCount("{% get_comment_count for comment_tests.article 1 as cc %}")
+        self.verifyGetCommentCount("{% get_comment_count for testapp.article 1 as cc %}")
 
     def testGetCommentCountFromObject(self):
         self.createSomeComments()
@@ -85,18 +86,18 @@ class CommentTemplateTagTests(CommentTestCase):
 
     def verifyGetCommentList(self, tag=None):
         c1, c2, c3, c4 = Comment.objects.all()[:4]
-        t = "{% load comments %}" +  (tag or "{% get_comment_list for comment_tests.author a.id as cl %}")
+        t = "{% load comments %}" +  (tag or "{% get_comment_list for testapp.author a.id as cl %}")
         ctx, out = self.render(t, a=Author.objects.get(pk=1))
         self.assertEqual(out, "")
         self.assertEqual(list(ctx["cl"]), [c2])
 
     def testGetCommentList(self):
         self.createSomeComments()
-        self.verifyGetCommentList("{% get_comment_list for comment_tests.author a.id as cl %}")
+        self.verifyGetCommentList("{% get_comment_list for testapp.author a.id as cl %}")
 
     def testGetCommentListFromLiteral(self):
         self.createSomeComments()
-        self.verifyGetCommentList("{% get_comment_list for comment_tests.author 1 as cl %}")
+        self.verifyGetCommentList("{% get_comment_list for testapp.author 1 as cl %}")
 
     def testGetCommentListFromObject(self):
         self.createSomeComments()
@@ -108,7 +109,7 @@ class CommentTemplateTagTests(CommentTestCase):
 
     def testGetCommentPermalink(self):
         c1, c2, c3, c4 = self.createSomeComments()
-        t = "{% load comments %}{% get_comment_list for comment_tests.author author.id as cl %}"
+        t = "{% load comments %}{% get_comment_list for testapp.author author.id as cl %}"
         t += "{% get_comment_permalink cl.0 %}"
         ct = ContentType.objects.get_for_model(Author)
         author = Author.objects.get(pk=1)
@@ -117,7 +118,7 @@ class CommentTemplateTagTests(CommentTestCase):
 
     def testGetCommentPermalinkFormatted(self):
         c1, c2, c3, c4 = self.createSomeComments()
-        t = "{% load comments %}{% get_comment_list for comment_tests.author author.id as cl %}"
+        t = "{% load comments %}{% get_comment_list for testapp.author author.id as cl %}"
         t += "{% get_comment_permalink cl.0 '#c%(id)s-by-%(user_name)s' %}"
         ct = ContentType.objects.get_for_model(Author)
         author = Author.objects.get(pk=1)
@@ -126,7 +127,7 @@ class CommentTemplateTagTests(CommentTestCase):
 
     def testWhitespaceInGetCommentPermalinkTag(self):
         c1, c2, c3, c4 = self.createSomeComments()
-        t = "{% load comments comment_testtags %}{% get_comment_list for comment_tests.author author.id as cl %}"
+        t = "{% load comments comment_testtags %}{% get_comment_list for testapp.author author.id as cl %}"
         t += "{% get_comment_permalink cl.0|noop:'x y' %}"
         ct = ContentType.objects.get_for_model(Author)
         author = Author.objects.get(pk=1)
@@ -134,13 +135,13 @@ class CommentTemplateTagTests(CommentTestCase):
         self.assertEqual(out, "/cr/%s/%s/#c%s" % (ct.id, author.id, c2.id))
 
     def testRenderCommentList(self, tag=None):
-        t = "{% load comments %}" + (tag or "{% render_comment_list for comment_tests.article a.id %}")
+        t = "{% load comments %}" + (tag or "{% render_comment_list for testapp.article a.id %}")
         ctx, out = self.render(t, a=Article.objects.get(pk=1))
         self.assertTrue(out.strip().startswith("<dl id=\"comments\">"))
         self.assertTrue(out.strip().endswith("</dl>"))
 
     def testRenderCommentListFromLiteral(self):
-        self.testRenderCommentList("{% render_comment_list for comment_tests.article 1 %}")
+        self.testRenderCommentList("{% render_comment_list for testapp.article 1 %}")
 
     def testRenderCommentListFromObject(self):
         self.testRenderCommentList("{% render_comment_list for a %}")

 from __future__ import absolute_import
 
 from django.conf.urls import patterns, url
-from django.contrib.comments.feeds import LatestCommentFeed
+
+from django_comments.feeds import LatestCommentFeed
 
 from .custom_comments import views
 

 from django.conf.urls import patterns, include
 from django.contrib import admin
-from django.contrib.comments.admin import CommentsAdmin
-from django.contrib.comments.models import Comment
+from django_comments.admin import CommentsAdmin
+from django_comments.models import Comment
 
 # Make a new AdminSite to avoid picking up the deliberately broken admin
 # modules in other tests.

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