From 8ac8db8d52dac8b7468f9f4fb9cb95312c26ad8b Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Fri, 8 Jan 2016 22:46:01 -0500 Subject: [PATCH] Removed support code for Django < 1.7. --- discover_jenkins/results.py | 5 +---- discover_jenkins/runner.py | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/discover_jenkins/results.py b/discover_jenkins/results.py index ef304b6..1c33afd 100644 --- a/discover_jenkins/results.py +++ b/discover_jenkins/results.py @@ -6,10 +6,7 @@ from xml.sax.saxutils import XMLGenerator from xml.sax.xmlreader import AttributesImpl from unittest import TextTestResult -try: - from django.utils.encoding import smart_text -except ImportError: - from django.utils.encoding import smart_unicode as smart_text +from django.utils.encoding import smart_text STDOUT_LINE = '\nStdout:\n%s' STDERR_LINE = '\nStderr:\n%s' diff --git a/discover_jenkins/runner.py b/discover_jenkins/runner.py index f727a3e..63df727 100644 --- a/discover_jenkins/runner.py +++ b/discover_jenkins/runner.py @@ -6,13 +6,7 @@ from importlib import import_module import django from django.core.exceptions import ImproperlyConfigured - -try: - # Django 1.6 - from django.test.runner import DiscoverRunner -except ImportError: - # Fallback to third-party app on Django 1.5 - from discover_runner.runner import DiscoverRunner +from django.test.runner import DiscoverRunner from .results import XMLTestResult from .settings import TASKS, OUTPUT_DIR