release 3.24.4

Author: xrotwang

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## 3.24.4
+
+- Fixed bug introduced by supporting escaped brackets in markdown link labels ...
+
 
 ## 3.24.3
 

docs/conf.py

@@ -22,7 +22,7 @@
 author = 'Robert Forkel'
 
 # The full version, including alpha/beta/rc tags
-release = '3.24.4.dev0'
+release = '3.24.4'
 
 
 # -- General configuration ---------------------------------------------------

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = clldutils
-version = 3.24.4.dev0
+version = 3.24.4
 license = Apache 2.0
 license_files = LICENSE
 author = Robert Forkel

src/clldutils/__init__.py

@@ -1 +1 @@
-__version__ = '3.24.4.dev0'
+__version__ = '3.24.4'

src/clldutils/markup.py

@@ -226,7 +226,10 @@ class MarkdownLink:
     """
     label = attr.ib()
     url = attr.ib()
-    pattern = re.compile(r'(?<!!)\[(?P<label>.*?)(?<!\\)]\((?P<url>[^)]+)\)')
+    # Link starts with "[" if not preceeded by "!" or escaped with "\".
+    # We match up to the next unescaped "]" and only optionally match the href enclosed in "()".
+    # This is we don't force parsing up to the next "]("!
+    pattern = re.compile(r'(?<!!)(?<!\\)\[(?P<label>.*?)(?<!\\)](\((?P<url>[^)]+)\))?')
     html_link = ('a', 'href')
 
     @classmethod
@@ -238,6 +241,8 @@ def from_string(cls, s):
 
     @classmethod
     def from_match(cls, match):
+        if match.groupdict()['url'] is None:
+            raise AttributeError
         return cls(**match.groupdict())
 
     @property
@@ -369,6 +374,9 @@ def replace(cls,
             links = list(reversed(links))
 
         def repl_wrapper(m):
+            if m.groupdict()['url'] is None:
+                yield m.string[m.start():m.end()]
+                return
             if not simple:
                 if not links:
                     # We got them all.

tests/test_markup.py

@@ -101,6 +101,18 @@ def test_markdownlink1(markdown, expected):
     assert MarkdownLink.replace(markdown, lambda ml: ml.update_url(fragment='c')) == expected
 
 
+def test_non_link_square_brackets():
+    assert MarkdownLink.replace(
+        '\\[stuff\\] and [a](b)) ', lambda ml: "--") == '\\[stuff\\] and --) '
+    assert MarkdownLink.replace(
+        '[stuff] and [a](b)) ', lambda ml: "--") == '[stuff] and --) '
+
+
+def test_invalid_markdownlink():
+    with pytest.raises(ValueError):
+        _ = MarkdownLink.from_string('[abc]')
+
+
 def test_escaped_brackets():
     text = r'[2001 \[2011\]](http://example.com) and [2022](url)'
     ml = MarkdownLink.from_string(text)