summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-10-12 11:08:05 -0400
committerTim Graham <timograham@gmail.com>2017-10-13 10:11:15 -0400
commit941b0a5b334e043b5fb5ea694d60da0128a8a3b8 (patch)
treef460c799deb63b0ea90876910df9c005be681fa0 /tests
parentabb636c1af7b2fd00a624985f60b7aff07374580 (diff)
Fixed #28708 -- Added constants to detect the Python version.
Diffstat (limited to 'tests')
-rw-r--r--tests/admin_scripts/tests.py2
-rw-r--r--tests/migrations/test_writer.py4
-rw-r--r--tests/view_tests/tests/test_debug.py3
3 files changed, 3 insertions, 6 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index 096984032f..e56d43c4bc 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -26,10 +26,10 @@ from django.db.migrations.recorder import MigrationRecorder
from django.test import (
LiveServerTestCase, SimpleTestCase, TestCase, override_settings,
)
+from django.utils.version import PY36
custom_templates_dir = os.path.join(os.path.dirname(__file__), 'custom_templates')
-PY36 = sys.version_info >= (3, 6)
SYSTEM_CHECK_MSG = 'System check identified no issues'
diff --git a/tests/migrations/test_writer.py b/tests/migrations/test_writer.py
index 0aeb2e5b99..5c9aa85c55 100644
--- a/tests/migrations/test_writer.py
+++ b/tests/migrations/test_writer.py
@@ -5,7 +5,6 @@ import functools
import math
import os
import re
-import sys
import uuid
from unittest import mock
@@ -25,11 +24,10 @@ from django.utils.deconstruct import deconstructible
from django.utils.functional import SimpleLazyObject
from django.utils.timezone import FixedOffset, get_default_timezone, utc
from django.utils.translation import gettext_lazy as _
+from django.utils.version import PY36
from .models import FoodManager, FoodQuerySet
-PY36 = sys.version_info >= (3, 6)
-
class Money(decimal.Decimal):
def deconstruct(self):
diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py
index b677fd98c9..f0b2d017d4 100644
--- a/tests/view_tests/tests/test_debug.py
+++ b/tests/view_tests/tests/test_debug.py
@@ -19,6 +19,7 @@ from django.urls import reverse
from django.utils.encoding import force_bytes
from django.utils.functional import SimpleLazyObject
from django.utils.safestring import mark_safe
+from django.utils.version import PY36
from django.views.debug import (
CLEANSED_SUBSTITUTE, CallableSettingWrapper, ExceptionReporter,
cleanse_setting, technical_500_response,
@@ -31,8 +32,6 @@ from ..views import (
sensitive_method_view, sensitive_view,
)
-PY36 = sys.version_info >= (3, 6)
-
class User:
def __str__(self):