Merged regressiontests and modeltests into the test root.

1 files changed, 0 insertions, 36 deletions

diff --git a/tests/modeltests/get_object_or_404/models.py b/tests/modeltests/get_object_or_404/models.py
deleted file mode 100644
index bda060569e..0000000000
--- a/tests/modeltests/get_object_or_404/models.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-35. DB-API Shortcuts
-
-``get_object_or_404()`` is a shortcut function to be used in view functions for
-performing a ``get()`` lookup and raising a ``Http404`` exception if a
-``DoesNotExist`` exception was raised during the ``get()`` call.
-
-``get_list_or_404()`` is a shortcut function to be used in view functions for
-performing a ``filter()`` lookup and raising a ``Http404`` exception if a
-``DoesNotExist`` exception was raised during the ``filter()`` call.
-"""
-
-from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
-
-
-@python_2_unicode_compatible
-class Author(models.Model):
-    name = models.CharField(max_length=50)
-
-    def __str__(self):
-        return self.name
-
-class ArticleManager(models.Manager):
-    def get_query_set(self):
-        return super(ArticleManager, self).get_query_set().filter(authors__name__icontains='sir')
-
-@python_2_unicode_compatible
-class Article(models.Model):
-    authors = models.ManyToManyField(Author)
-    title = models.CharField(max_length=50)
-    objects = models.Manager()
-    by_a_sir = ArticleManager()
-
-    def __str__(self):
-        return self.title