Merge branch 'master' of github.com:garethr/django-test-extensions

garethr · Jun 22, 2011 · 7be8f31 · 7be8f31
2 parents aa4921b + e3ef4c5
commit 7be8f31
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/test_extensions/testrunners/xmloutput.py b/src/test_extensions/testrunners/xmloutput.py
@@ -3,9 +3,13 @@
 from xmlunit.unittest import _WritelnDecorator, XmlTextTestRunner as his_XmlTextTestRunner
 
 from django.test.simple import *
-from django.utils import unittest
 from xml.sax.saxutils import escape
 
+try:
+    # The django.utils.unittest alias is available in Django >= 1.3
+    from django.utils import unittest
+except ImportError:
+    import unittest
 
 try:
     class XMLTestSuiteRunner(DjangoTestSuiteRunner):