From bf18ce71360e4c10d3022304a18b9c87c7714eed Mon Sep 17 00:00:00 2001 From: Simon Cross Date: Wed, 26 Apr 2023 01:35:37 +0200 Subject: [PATCH 1/4] Import ElementTree from xml.etree. --- mdx_attr_cols.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mdx_attr_cols.py b/mdx_attr_cols.py index d823119..8618d6d 100644 --- a/mdx_attr_cols.py +++ b/mdx_attr_cols.py @@ -1,7 +1,8 @@ """ Bootstrap 3 grid extension fo Python Markdown """ -from markdown.util import etree +from xml.etree import ElementTree as etree + from markdown import Extension from markdown.treeprocessors import Treeprocessor From af9dfdb86878e1fe9764fa87ac7636b9581e3f3e Mon Sep 17 00:00:00 2001 From: Simon Cross Date: Wed, 26 Apr 2023 01:36:14 +0200 Subject: [PATCH 2/4] Import ElementTree from xml.etree and remove use of deprecated .assertRaisesRegex. --- tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests.py b/tests.py index 708b028..a869a94 100644 --- a/tests.py +++ b/tests.py @@ -1,9 +1,9 @@ from unittest import TestCase +from xml.etree import ElementTree as etree import xmltodict from markdown import Markdown -from markdown.util import etree from mdx_attr_cols import AttrColTreeProcessor, AttrColExtension, makeExtension @@ -90,7 +90,7 @@ def test_extend_markdown(self): def test_missing_attr_list(self): md = self.mk_markdown(['mdx_outline']) ext = AttrColExtension({}) - self.assertRaisesRegexp( + self.assertRaisesRegex( RuntimeError, "The attr_cols markdown extension depends the following" " extensions which must preceded it in the extension list:" @@ -101,7 +101,7 @@ def test_missing_attr_list(self): def test_missing_outline(self): md = self.mk_markdown([]) ext = AttrColExtension({}) - self.assertRaisesRegexp( + self.assertRaisesRegex( RuntimeError, "The attr_cols markdown extension depends the following" " extensions which must preceded it in the extension list:" From fdf1fc35e53114b75c8507c83b7816f65f3cbd2d Mon Sep 17 00:00:00 2001 From: Simon Cross Date: Wed, 26 Apr 2023 01:37:51 +0200 Subject: [PATCH 3/4] Update Python versions in test matrix. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d4b2b4c..1596ef4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9, 3.10, 3.11] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From 0bbb3a068fbbdfb362d9268ceab8381653b5eb6e Mon Sep 17 00:00:00 2001 From: Simon Cross Date: Wed, 26 Apr 2023 01:43:29 +0200 Subject: [PATCH 4/4] Write Python versions as strings. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1596ef4..10a3be7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9, 3.10, 3.11] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }}