Update Django testing to use the currently supported versions.

Author: timgraham

tox.ini

@@ -1,12 +1,11 @@
 [tox]
-envlist = begin,py{26,27,33,34},py27-django{lts,prev,curr},end,quality
+envlist = begin,py{26,27,33,34},py27-django{lts,curr},end,quality
 
 [testenv]
 deps =
     coverage
-    djangolts: django==1.4.22
-    djangoprev: django==1.6.11
-    djangocurr: django==1.7.10
+    djangolts: django==1.8.7
+    djangocurr: django==1.9
 commands =
     coverage run --append setup.py test
     coverage report --omit='.tox/*'

xmlrunner/extra/djangotestrunner.py

@@ -10,21 +10,11 @@
 """
 
 import xmlrunner
-import django
 from django.conf import settings
+from django.test.runner import DiscoverRunner
 
-# future compatibilty with django
-# in django 1.6 DiscoverRunner bacame default and
-# DjangoTestSuiteRunner became depecated, will be removed in 1.8
-if django.VERSION < (1, 6):
-    from django.test.simple import DjangoTestSuiteRunner
-    _DjangoRunner = DjangoTestSuiteRunner
-else:
-    from django.test.runner import DiscoverRunner
-    _DjangoRunner = DiscoverRunner
 
-
-class XMLTestRunner(_DjangoRunner):
+class XMLTestRunner(DiscoverRunner):
 
     def run_suite(self, suite, **kwargs):
         dummy = kwargs  # unused