mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-04-12 14:56:53 +02:00
27894998c0
assertRegexpMatches has been replaced with assertRegex from python-3.2: https://docs.python.org/3.7/library/unittest#unittest.TestCase.assertRegex The assertRegexpMatches deprecated alias was removed in python 3.12. Patch submitted upstream: https://github.com/blockdiag/actdiag/pull/26
83 lines
3.8 KiB
Diff
83 lines
3.8 KiB
Diff
From 9b25a82fb8ca037b0a76cbec8396cd57bee4e021 Mon Sep 17 00:00:00 2001
|
|
From: Wenlong Zhang <zhangwenlong@loongson.cn>
|
|
Date: Sat, 6 Jul 2024 02:00:12 +0000
|
|
Subject: [PATCH] assertRegexpMatches has been replaced with assertRegex from
|
|
python-3.2
|
|
|
|
https://cainiaojiaocheng.com/Python/docs/3.7/library/unittest#unittest.TestCase.assertRegex
|
|
backport from upstream: https://github.com/blockdiag/actdiag/pull/26
|
|
|
|
---
|
|
src/actdiag/tests/test_rst_directives.py | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/actdiag/tests/test_rst_directives.py b/src/actdiag/tests/test_rst_directives.py
|
|
index 9af9ff7..73fa3c5 100644
|
|
--- a/src/actdiag/tests/test_rst_directives.py
|
|
+++ b/src/actdiag/tests/test_rst_directives.py
|
|
@@ -131,7 +131,7 @@ class TestRstDirectives(unittest.TestCase):
|
|
self.assertEqual(1, len(doctree))
|
|
self.assertEqual(nodes.image, type(doctree[0]))
|
|
svg = open(doctree[0]['uri']).read()
|
|
- self.assertRegexpMatches(svg, r'<svg height="\d+" width="\d+" ')
|
|
+ self.assertRegex(svg, r'<svg height="\d+" width="\d+" ')
|
|
|
|
def test_setup_noviewbox_is_false(self):
|
|
directives.setup(format='SVG', outputdir=self.tmpdir, noviewbox=False)
|
|
@@ -142,7 +142,7 @@ class TestRstDirectives(unittest.TestCase):
|
|
self.assertEqual(1, len(doctree))
|
|
self.assertEqual(nodes.image, type(doctree[0]))
|
|
svg = open(doctree[0]['uri']).read()
|
|
- self.assertRegexpMatches(svg, r'<svg viewBox="0 0 \d+ \d+" ')
|
|
+ self.assertRegex(svg, r'<svg viewBox="0 0 \d+ \d+" ')
|
|
|
|
def test_setup_inline_svg_is_true(self):
|
|
directives.setup(format='SVG', outputdir=self.tmpdir, inline_svg=True)
|
|
@@ -189,7 +189,7 @@ class TestRstDirectives(unittest.TestCase):
|
|
self.assertEqual(1, len(doctree))
|
|
self.assertEqual(nodes.raw, type(doctree[0]))
|
|
self.assertEqual(nodes.Text, type(doctree[0][0]))
|
|
- self.assertRegexpMatches(doctree[0][0],
|
|
+ self.assertRegex(doctree[0][0],
|
|
r'<svg height="\d+" width="100" ')
|
|
|
|
def test_setup_inline_svg_is_true_and_width_option2(self):
|
|
@@ -203,7 +203,7 @@ class TestRstDirectives(unittest.TestCase):
|
|
self.assertEqual(1, len(doctree))
|
|
self.assertEqual(nodes.raw, type(doctree[0]))
|
|
self.assertEqual(nodes.Text, type(doctree[0][0]))
|
|
- self.assertRegexpMatches(doctree[0][0],
|
|
+ self.assertRegex(doctree[0][0],
|
|
r'<svg height="\d+" width="10000" ')
|
|
|
|
def test_setup_inline_svg_is_true_and_height_option1(self):
|
|
@@ -217,7 +217,7 @@ class TestRstDirectives(unittest.TestCase):
|
|
self.assertEqual(1, len(doctree))
|
|
self.assertEqual(nodes.raw, type(doctree[0]))
|
|
self.assertEqual(nodes.Text, type(doctree[0][0]))
|
|
- self.assertRegexpMatches(doctree[0][0],
|
|
+ self.assertRegex(doctree[0][0],
|
|
r'<svg height="100" width="\d+" ')
|
|
|
|
def test_setup_inline_svg_is_true_and_height_option2(self):
|
|
@@ -231,7 +231,7 @@ class TestRstDirectives(unittest.TestCase):
|
|
self.assertEqual(1, len(doctree))
|
|
self.assertEqual(nodes.raw, type(doctree[0]))
|
|
self.assertEqual(nodes.Text, type(doctree[0][0]))
|
|
- self.assertRegexpMatches(doctree[0][0],
|
|
+ self.assertRegex(doctree[0][0],
|
|
r'<svg height="10000" width="\d+" ')
|
|
|
|
def test_setup_inline_svg_is_true_and_width_and_height_option(self):
|
|
@@ -246,7 +246,7 @@ class TestRstDirectives(unittest.TestCase):
|
|
self.assertEqual(1, len(doctree))
|
|
self.assertEqual(nodes.raw, type(doctree[0]))
|
|
self.assertEqual(nodes.Text, type(doctree[0][0]))
|
|
- self.assertRegexpMatches(doctree[0][0],
|
|
+ self.assertRegex(doctree[0][0],
|
|
'<svg height="100" width="200" ')
|
|
|
|
def test_call_with_braces(self):
|
|
--
|
|
2.45.2
|
|
|