From 7f582d8b8b845fbd9ed67b32ac0dd6ebeadb8cc2 Mon Sep 17 00:00:00 2001
From: David Smith <smithdc@gmail.com>
Date: Fri, 18 Feb 2022 18:45:23 +0000
Subject: [PATCH] Refs #33173 -- Added Python 3.11 version info util.
---
django/utils/version.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/django/utils/version.py b/django/utils/version.py
index a72d320..7fef5a9 100644
--- a/django/utils/version.py
+++ b/django/utils/version.py
@@ -15,6 +15,7 @@ PY37 = sys.version_info >= (3, 7)
PY38 = sys.version_info >= (3, 8)
PY39 = sys.version_info >= (3, 9)
PY310 = sys.version_info >= (3, 10)
+PY311 = sys.version_info >= (3, 11)
def get_version(version=None):
--
2.35.3
From 0876a3726aa37b5c15bc72bc1c05191bc74c6940 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Wed, 6 Apr 2022 19:23:38 +0200
Subject: [PATCH] Refs #33173 -- Fixed test_runner/test_utils tests on Python
3.11+.
Python 3.11 uses fully qualified test name in unittest output. See
https://github.com/python/cpython/commit/755be9b1505af591b9f2ee424a6525b6c2b65ce9
---
tests/test_runner/test_debug_sql.py | 14 +++++++++-----
tests/test_runner/test_parallel.py | 5 ++++-
tests/test_utils/tests.py | 9 +++++++--
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/tests/test_runner/test_debug_sql.py b/tests/test_runner/test_debug_sql.py
index 0e8e420..424f77e 100644
--- a/tests/test_runner/test_debug_sql.py
+++ b/tests/test_runner/test_debug_sql.py
@@ -4,6 +4,7 @@ from io import StringIO
from django.db import connection
from django.test import TestCase
from django.test.runner import DiscoverRunner
+from django.utils.version import PY311
from .models import Person
@@ -100,14 +101,17 @@ class TestDebugSQL(unittest.TestCase):
'''"test_runner_person"."first_name" = 'subtest-fail';'''),
]
+ # Python 3.11 uses fully qualified test name in the output.
+ method_name = '.runTest' if PY311 else ''
+ test_class_path = 'test_runner.test_debug_sql.TestDebugSQL'
verbose_expected_outputs = [
- 'runTest (test_runner.test_debug_sql.TestDebugSQL.FailingTest) ... FAIL',
- 'runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorTest) ... ERROR',
- 'runTest (test_runner.test_debug_sql.TestDebugSQL.PassingTest) ... ok',
+ f'runTest ({test_class_path}.FailingTest{method_name}) ... FAIL',
+ f'runTest ({test_class_path}.ErrorTest{method_name}) ... ERROR',
+ f'runTest ({test_class_path}.PassingTest{method_name}) ... ok',
# If there are errors/failures in subtests but not in test itself,
# the status is not written. That behavior comes from Python.
- 'runTest (test_runner.test_debug_sql.TestDebugSQL.FailingSubTest) ...',
- 'runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorSubTest) ...',
+ f'runTest ({test_class_path}.FailingSubTest{method_name}) ...',
+ f'runTest ({test_class_path}.ErrorSubTest{method_name}) ...',
('''SELECT COUNT(*) AS "__count" '''
'''FROM "test_runner_person" WHERE '''
'''"test_runner_person"."first_name" = 'pass';'''),
diff --git a/tests/test_runner/test_parallel.py b/tests/test_runner/test_parallel.py
index e275798..b6855ab 100644
--- a/tests/test_runner/test_parallel.py
+++ b/tests/test_runner/test_parallel.py
@@ -4,6 +4,7 @@ import unittest
from django.test import SimpleTestCase
from django.test.runner import RemoteTestResult
+from django.utils.version import PY311
try:
import tblib.pickling_support
@@ -123,7 +124,9 @@ class RemoteTestResultTest(SimpleTestCase):
event = events[1]
self.assertEqual(event[0], 'addSubTest')
- self.assertEqual(str(event[2]), 'dummy_test (test_runner.test_parallel.SampleFailingSubtest) (index=0)')
+ self.assertEqual(str(event[2]), 'dummy_test (test_runner.test_parallel.SampleFailingSubtest%s) (index=0)'
+ # Python 3.11 uses fully qualified test name in the output.
+ % ('.dummy_test' if PY311 else ""))
self.assertEqual(repr(event[3][1]), "AssertionError('0 != 1')")
event = events[2]
diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py
index aea293b..7fb5533 100644
--- a/tests/test_utils/tests.py
+++ b/tests/test_utils/tests.py
@@ -31,6 +31,7 @@ from django.test.utils import (
from django.urls import NoReverseMatch, path, reverse, reverse_lazy
from django.utils.deprecation import RemovedInDjango41Warning
from django.utils.log import DEFAULT_LOGGING
+from django.utils.version import PY311
from .models import Car, Person, PossessedCar
from .views import empty_response
@@ -83,9 +84,11 @@ class SkippingTestCase(SimpleTestCase):
SkipTestCase('test_foo').test_foo,
ValueError,
"skipUnlessDBFeature cannot be used on test_foo (test_utils.tests."
- "SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase) "
+ "SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase%s) "
"as SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase "
"doesn't allow queries against the 'default' database."
+ # Python 3.11 uses fully qualified test name in the output.
+ % (".test_foo" if PY311 else ""),
)
def test_skip_if_db_feature(self):
@@ -127,9 +130,11 @@ class SkippingTestCase(SimpleTestCase):
SkipTestCase('test_foo').test_foo,
ValueError,
"skipIfDBFeature cannot be used on test_foo (test_utils.tests."
- "SkippingTestCase.test_skip_if_db_feature.<locals>.SkipTestCase) "
+ "SkippingTestCase.test_skip_if_db_feature.<locals>.SkipTestCase%s) "
"as SkippingTestCase.test_skip_if_db_feature.<locals>.SkipTestCase "
"doesn't allow queries against the 'default' database."
+ # Python 3.11 uses fully qualified test name in the output.
+ % (".test_foo" if PY311 else ""),
)
--
2.35.3
From da65ed184905265871b92c4c9a6c118d05c68592 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Mon, 9 May 2022 08:34:37 +0200
Subject: [PATCH] Refs #33173 -- Fixed test_dateparse tests on Python 3.11+.
date/datetime/time.fromisoformat() support any valid ISO 8601 format
in Python 3.11+, see https://github.com/python/cpython/issues/80010.
---
tests/utils_tests/test_dateparse.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/utils_tests/test_dateparse.py b/tests/utils_tests/test_dateparse.py
index 0880de2..b6f0ffd 100644
--- a/tests/utils_tests/test_dateparse.py
+++ b/tests/utils_tests/test_dateparse.py
@@ -5,6 +5,7 @@ from django.utils.dateparse import (
parse_date, parse_datetime, parse_duration, parse_time,
)
from django.utils.timezone import get_fixed_timezone
+from django.utils.version import PY311
class DateParseTests(unittest.TestCase):
@@ -13,14 +14,18 @@ class DateParseTests(unittest.TestCase):
# Valid inputs
self.assertEqual(parse_date('2012-04-23'), date(2012, 4, 23))
self.assertEqual(parse_date('2012-4-9'), date(2012, 4, 9))
+ if PY311:
+ self.assertEqual(parse_date('20120423'), date(2012, 4, 23))
# Invalid inputs
- self.assertIsNone(parse_date('20120423'))
+ self.assertIsNone(parse_date('2012423'))
with self.assertRaises(ValueError):
parse_date('2012-04-56')
def test_parse_time(self):
# Valid inputs
self.assertEqual(parse_time('09:15:00'), time(9, 15))
+ if PY311:
+ self.assertEqual(parse_time('091500'), time(9, 15))
self.assertEqual(parse_time('10:10'), time(10, 10))
self.assertEqual(parse_time('10:20:30.400'), time(10, 20, 30, 400000))
self.assertEqual(parse_time('10:20:30,400'), time(10, 20, 30, 400000))
@@ -33,7 +38,7 @@ class DateParseTests(unittest.TestCase):
self.assertIsNone(parse_time('00:05:23+'))
self.assertIsNone(parse_time('00:05:23+25:00'))
self.assertIsNone(parse_time('4:18:101'))
- self.assertIsNone(parse_time('091500'))
+ self.assertIsNone(parse_time('91500'))
with self.assertRaises(ValueError):
parse_time('09:15:90')
--
2.35.3