From f5b542b6bd83ef04a0c9633ef3adfdba1247f053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Tarot=20=28silopolis=29?= Date: Tue, 21 Nov 2023 17:08:28 +0100 Subject: [PATCH 1/4] git: update `.gitignore` --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 92cd29a..dc3ef71 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ __pycache__/ .Python env/ venv/ +.venv/ venv2/ venv3/ build/ @@ -24,6 +25,7 @@ var/ *.egg-info/ .installed.cfg *.egg +.eggs/ # PyInstaller # Usually these files are written by a python script from a template From 09e60268d6ad671bea30d5da47298fe242b47927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Tarot=20=28silopolis=29?= Date: Tue, 21 Nov 2023 17:09:15 +0100 Subject: [PATCH 2/4] parser: fix deprecated etree import --- markdown_blockdiag/parser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown_blockdiag/parser.py b/markdown_blockdiag/parser.py index 952aac2..86feb8d 100644 --- a/markdown_blockdiag/parser.py +++ b/markdown_blockdiag/parser.py @@ -3,7 +3,7 @@ import base64 from markdown.blockprocessors import BlockProcessor -from markdown.util import etree +import xml.etree.ElementTree as etree from markdown_blockdiag.utils import draw_blockdiag, DIAG_MODULES # Python 3 version From 503ba20e0918a0e971ff27f9c6750890419619db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Tarot=20=28silopolis=29?= Date: Tue, 21 Nov 2023 17:25:21 +0100 Subject: [PATCH 3/4] Remove md_globals kwarg The 3.4 release of Markdown dropped the md_globals kwarg --- markdown_blockdiag/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown_blockdiag/extension.py b/markdown_blockdiag/extension.py index 32826dc..5dd7386 100644 --- a/markdown_blockdiag/extension.py +++ b/markdown_blockdiag/extension.py @@ -12,7 +12,7 @@ def __init__(self, **kwargs): } super(BlockdiagExtension, self).__init__(**kwargs) - def extendMarkdown(self, md, md_globals): + def extendMarkdown(self, md): md.parser.blockprocessors.add( 'blockdiag', BlockdiagProcessor(md.parser, self), '>indent' ) From 3153aa9aa3f4683ab93f67113ac7708cec26e7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Tarot=20=28silopolis=29?= Date: Tue, 21 Nov 2023 17:35:45 +0100 Subject: [PATCH 4/4] Fix non existent `add` method Probably deprecated Use `register` instead --- markdown_blockdiag/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown_blockdiag/extension.py b/markdown_blockdiag/extension.py index 5dd7386..aa65494 100644 --- a/markdown_blockdiag/extension.py +++ b/markdown_blockdiag/extension.py @@ -13,7 +13,7 @@ def __init__(self, **kwargs): super(BlockdiagExtension, self).__init__(**kwargs) def extendMarkdown(self, md): - md.parser.blockprocessors.add( + md.parser.blockprocessors.register( 'blockdiag', BlockdiagProcessor(md.parser, self), '>indent' ) md.registerExtension(self)