mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-13 00:10:04 +03:00
59 lines
2.5 KiB
Diff
59 lines
2.5 KiB
Diff
From 18628d51012830f12a2a888223c6e5153729004d Mon Sep 17 00:00:00 2001
|
|
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
|
|
Date: Tue, 20 Feb 2024 20:59:26 +0100
|
|
Subject: [PATCH] Refs #34900 -- Fixed
|
|
CommandTypes.test_help_default_options_with_custom_arguments test on Python
|
|
3.13+.
|
|
|
|
https://github.com/python/cpython/commit/c4a2e8a2c5188c3288d57b80852e92c83f46f6f3
|
|
---
|
|
django/utils/version.py | 1 +
|
|
tests/admin_scripts/tests.py | 15 +++++++++++----
|
|
2 files changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/django/utils/version.py b/django/utils/version.py
|
|
index 1e9c720299..71ec70bd67 100644
|
|
--- a/django/utils/version.py
|
|
+++ b/django/utils/version.py
|
|
@@ -17,6 +17,7 @@ PY39 = sys.version_info >= (3, 9)
|
|
PY310 = sys.version_info >= (3, 10)
|
|
PY311 = sys.version_info >= (3, 11)
|
|
PY312 = sys.version_info >= (3, 12)
|
|
+PY313 = sys.version_info >= (3, 13)
|
|
|
|
|
|
def get_version(version=None):
|
|
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
|
|
index 6d67c2931a..8373560499 100644
|
|
--- a/tests/admin_scripts/tests.py
|
|
+++ b/tests/admin_scripts/tests.py
|
|
@@ -33,6 +33,7 @@ from django.test import LiveServerTestCase, SimpleTestCase, TestCase, override_s
|
|
from django.test.utils import captured_stderr, captured_stdout
|
|
from django.urls import path
|
|
from django.utils.version import PY39
|
|
+from django.utils.version import PY313
|
|
from django.views.static import serve
|
|
|
|
from . import urls
|
|
@@ -1900,10 +1901,16 @@ class CommandTypes(AdminScriptTestCase):
|
|
]
|
|
for option in expected_options:
|
|
self.assertOutput(out, f"[{option}]")
|
|
- self.assertOutput(out, "--option_a OPTION_A, -a OPTION_A")
|
|
- self.assertOutput(out, "--option_b OPTION_B, -b OPTION_B")
|
|
- self.assertOutput(out, "--option_c OPTION_C, -c OPTION_C")
|
|
- self.assertOutput(out, "-v {0,1,2,3}, --verbosity {0,1,2,3}")
|
|
+ if PY313:
|
|
+ self.assertOutput(out, "--option_a, -a OPTION_A")
|
|
+ self.assertOutput(out, "--option_b, -b OPTION_B")
|
|
+ self.assertOutput(out, "--option_c, -c OPTION_C")
|
|
+ self.assertOutput(out, "-v, --verbosity {0,1,2,3}")
|
|
+ else:
|
|
+ self.assertOutput(out, "--option_a OPTION_A, -a OPTION_A")
|
|
+ self.assertOutput(out, "--option_b OPTION_B, -b OPTION_B")
|
|
+ self.assertOutput(out, "--option_c OPTION_C, -c OPTION_C")
|
|
+ self.assertOutput(out, "-v {0,1,2,3}, --verbosity {0,1,2,3}")
|
|
|
|
def test_color_style(self):
|
|
style = color.no_style()
|