Merge pull request #628 from Crozzers/fix-typeerror-middle-word-em

Fix TypeError in MiddleWordEm extra when options was None (#627)

Author: nicholasserra

CHANGES.md

@@ -6,6 +6,7 @@
 - [pull #622] Add missing block tags to regex (#620)
 - [pull #623] Don't escape plus signs in URLs (#621)
 - [pull #626] Fix XSS when encoding incomplete tags (#625)
+- [pull #628] Fix TypeError in MiddleWordEm extra when options was None (#627)
 
 
 ## python-markdown2 2.5.3

lib/markdown2.py

@@ -2460,7 +2460,7 @@ class ItalicAndBoldProcessor(Extra):
     strong_re = Markdown._strong_re
     em_re = Markdown._em_re
 
-    def __init__(self, md: Markdown, options: dict):
+    def __init__(self, md: Markdown, options: Optional[dict]):
         super().__init__(md, options)
         self.hash_table = {}
 
@@ -3293,7 +3293,7 @@ class MiddleWordEm(ItalicAndBoldProcessor):
     name = 'middle-word-em'
     order = (CodeFriendly,), (Stage.ITALIC_AND_BOLD,)
 
-    def __init__(self, md: Markdown, options: Union[dict, bool]):
+    def __init__(self, md: Markdown, options: Union[dict, bool, None]):
         '''
         Args:
             md: the markdown instance
@@ -3304,6 +3304,8 @@ def __init__(self, md: Markdown, options: Union[dict, bool]):
         '''
         if isinstance(options, bool):
             options = {'allowed': options}
+        else:
+            options = options or {}
         options.setdefault('allowed', True)
         super().__init__(md, options)
 

test/tm-cases/middle_word_em_issue627.html

@@ -0,0 +1 @@
+<p>abc<em>def</em>ghi</p>

test/tm-cases/middle_word_em_issue627.opts

@@ -0,0 +1 @@
+{'extras': {'middle-word-em': None}}

test/tm-cases/middle_word_em_issue627.text

@@ -0,0 +1 @@
+abc_def_ghi