From 1cde31c86d9423e9b7a7409c2ef2ba7c0500e47f Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Sat, 25 Feb 2012 18:45:17 +0000
Subject: Massive merge

---
 djangorestframework/tests/__init__.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'djangorestframework/tests/__init__.py')

diff --git a/djangorestframework/tests/__init__.py b/djangorestframework/tests/__init__.py
index f664c5c1..641b0277 100644
--- a/djangorestframework/tests/__init__.py
+++ b/djangorestframework/tests/__init__.py
@@ -10,4 +10,3 @@ for module in modules:
     exec("from djangorestframework.tests.%s import __doc__ as module_doc" % module)
     exec("from djangorestframework.tests.%s import *" % module)
     __test__[module] = module_doc or ""
-
-- 
cgit v1.2.3


From 87dae4d8549c02fa9a57adb3bb876d249dae1f79 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 20 Sep 2012 13:19:43 +0100
Subject: Remove old 'djangorestframework directories

---
 djangorestframework/tests/__init__.py | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 djangorestframework/tests/__init__.py

(limited to 'djangorestframework/tests/__init__.py')

diff --git a/djangorestframework/tests/__init__.py b/djangorestframework/tests/__init__.py
deleted file mode 100644
index 641b0277..00000000
--- a/djangorestframework/tests/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""Force import of all modules in this package in order to get the standard test runner to pick up the tests.  Yowzers."""
-import os
-
-modules = [filename.rsplit('.', 1)[0]
-           for filename in os.listdir(os.path.dirname(__file__))
-           if filename.endswith('.py') and not filename.startswith('_')]
-__test__ = dict()
-
-for module in modules:
-    exec("from djangorestframework.tests.%s import __doc__ as module_doc" % module)
-    exec("from djangorestframework.tests.%s import *" % module)
-    __test__[module] = module_doc or ""
-- 
cgit v1.2.3