diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-04-05 13:59:10 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-04-05 13:59:55 +0200 |
| commit | 32cfa73c6a7264a0b6365cc380ca0b257b6fc07a (patch) | |
| tree | 4b289f697248907298c271b55de7f4aca9ae5cc2 | |
| parent | 05d6efa958cce208c598e1187918ac129571fb82 (diff) | |
[4.2.x] Refs #34118 -- Fixed CustomChoicesTests.test_uuid_unsupported on Python 3.12+.
https://github.com/python/cpython/commit/2a4d8c0a9e88f45047da640ce5a92b304d2d39b1
Backport of 38e63c9e61152682f3ff982c85a73793ab6d3267 from main
| -rw-r--r-- | django/utils/version.py | 1 | ||||
| -rw-r--r-- | tests/model_enums/tests.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/django/utils/version.py b/django/utils/version.py index 5b6a435b51..1e9c720299 100644 --- a/django/utils/version.py +++ b/django/utils/version.py @@ -16,6 +16,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) +PY312 = sys.version_info >= (3, 12) def get_version(version=None): diff --git a/tests/model_enums/tests.py b/tests/model_enums/tests.py index 347c464a8c..1276341108 100644 --- a/tests/model_enums/tests.py +++ b/tests/model_enums/tests.py @@ -8,6 +8,7 @@ from django.template import Context, Template from django.test import SimpleTestCase from django.utils.functional import Promise from django.utils.translation import gettext_lazy as _ +from django.utils.version import PY312 class Suit(models.IntegerChoices): @@ -311,7 +312,10 @@ class CustomChoicesTests(SimpleTestCase): pass def test_uuid_unsupported(self): - msg = "UUID objects are immutable" + if PY312: + msg = "_value_ not set in __new__, unable to create it" + else: + msg = "UUID objects are immutable" with self.assertRaisesMessage(TypeError, msg): class Identifier(uuid.UUID, models.Choices): |