mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 19:16:11 +00:00
Code Issues 27 Releases Wiki Activity

[4.2.x] Refs #34118 -- Fixed CustomChoicesTests.test_uuid_unsupported on Python 3.12+.

Browse Source 
2a4d8c0a9e
Backport of 38e63c9e61 from main
This commit is contained in:
Mariusz Felisiak 2023-04-05 13:59:10 +02:00
parent 05d6efa958
commit 32cfa73c6a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/utils/version.py
View File

@ -16,6 +16,7 @@ PY38 = sys.version_info >= (3, 8)
PY39 = sys.version_info >= (3, 9) PY39 = sys.version_info >= (3, 9)
PY310 = sys.version_info >= (3, 10) PY310 = sys.version_info >= (3, 10)
PY311 = sys.version_info >= (3, 11) PY311 = sys.version_info >= (3, 11)
PY312 = sys.version_info >= (3, 12)
def get_version(version=None): def get_version(version=None):

6
tests/model_enums/tests.py
View File

@ -8,6 +8,7 @@ from django.template import Context, Template
from django.test import SimpleTestCase from django.test import SimpleTestCase
from django.utils.functional import Promise from django.utils.functional import Promise
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.utils.version import PY312
class Suit(models.IntegerChoices): class Suit(models.IntegerChoices):
@ -311,7 +312,10 @@ class CustomChoicesTests(SimpleTestCase):
pass pass
def test_uuid_unsupported(self): 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): with self.assertRaisesMessage(TypeError, msg):
class Identifier(uuid.UUID, models.Choices): class Identifier(uuid.UUID, models.Choices):