From 7fd1571b2e7f75c2e456de89d8c5bd805b16c1a9 Mon Sep 17 00:00:00 2001
From: Preston Timmons <prestontimmons@gfa.org>
Date: Tue, 2 Apr 2013 23:07:41 +0000
Subject: [PATCH] Modified admindocs tests to work with unittest2 discovery.

---
 django/contrib/admindocs/tests/__init__.py    | 37 +---------------
 django/contrib/admindocs/tests/fields.py      |  7 ----
 django/contrib/admindocs/tests/test_fields.py | 42 +++++++++++++++++++
 3 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 django/contrib/admindocs/tests/fields.py
 create mode 100644 django/contrib/admindocs/tests/test_fields.py

diff --git a/django/contrib/admindocs/tests/__init__.py b/django/contrib/admindocs/tests/__init__.py
index aa5bd6a8dc..2a67f83bcb 100644
--- a/django/contrib/admindocs/tests/__init__.py
+++ b/django/contrib/admindocs/tests/__init__.py
@@ -1,36 +1 @@
-from __future__ import absolute_import, unicode_literals
-
-from django.contrib.admindocs import views
-from django.db.models import fields as builtin_fields
-from django.utils import unittest
-from django.utils.translation import ugettext as _
-
-from . import fields
-
-
-class TestFieldType(unittest.TestCase):
-    def setUp(self):
-        pass
-
-    def test_field_name(self):
-        self.assertRaises(AttributeError,
-            views.get_readable_field_data_type, "NotAField"
-        )
-
-    def test_builtin_fields(self):
-        self.assertEqual(
-            views.get_readable_field_data_type(builtin_fields.BooleanField()),
-            _('Boolean (Either True or False)')
-        )
-
-    def test_custom_fields(self):
-        self.assertEqual(
-            views.get_readable_field_data_type(fields.CustomField()),
-            'A custom field type'
-        )
-        self.assertEqual(
-            views.get_readable_field_data_type(fields.DescriptionLackingField()),
-            _('Field of type: %(field_type)s') % {
-                'field_type': 'DescriptionLackingField'
-            }
-        )
+from .test_fields import TestFieldType
diff --git a/django/contrib/admindocs/tests/fields.py b/django/contrib/admindocs/tests/fields.py
deleted file mode 100644
index e59498afb5..0000000000
--- a/django/contrib/admindocs/tests/fields.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.db import models
-
-class CustomField(models.Field):
-    description = "A custom field type"
-
-class DescriptionLackingField(models.Field):
-    pass
diff --git a/django/contrib/admindocs/tests/test_fields.py b/django/contrib/admindocs/tests/test_fields.py
new file mode 100644
index 0000000000..c048f20287
--- /dev/null
+++ b/django/contrib/admindocs/tests/test_fields.py
@@ -0,0 +1,42 @@
+from __future__ import absolute_import, unicode_literals
+
+from django.contrib.admindocs import views
+from django.db import models
+from django.db.models import fields
+from django.utils import unittest
+from django.utils.translation import ugettext as _
+
+
+class CustomField(models.Field):
+    description = "A custom field type"
+
+class DescriptionLackingField(models.Field):
+    pass
+
+
+class TestFieldType(unittest.TestCase):
+    def setUp(self):
+        pass
+
+    def test_field_name(self):
+        self.assertRaises(AttributeError,
+            views.get_readable_field_data_type, "NotAField"
+        )
+
+    def test_builtin_fields(self):
+        self.assertEqual(
+            views.get_readable_field_data_type(fields.BooleanField()),
+            _('Boolean (Either True or False)')
+        )
+
+    def test_custom_fields(self):
+        self.assertEqual(
+            views.get_readable_field_data_type(CustomField()),
+            'A custom field type'
+        )
+        self.assertEqual(
+            views.get_readable_field_data_type(DescriptionLackingField()),
+            _('Field of type: %(field_type)s') % {
+                'field_type': 'DescriptionLackingField'
+            }
+        )