Remove remaining use of markdown2. Enable markdown extras when rendering agendas. Fixes ietf-tools#3316. Commit ready for merge.

rjsparks · rjsparks · commit 6ac363e3e2b1 · 2021-09-08T17:54:40.000Z
- Legacy-Id: 19358
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
@@ -546,10 +546,10 @@ def do_test_materials(self, meeting, session):
         filename = cont_disp_settings.get('filename', '').strip('"')
         if filename.endswith('.md'):
             for accept, cont_type, content in [
-                    ('text/html,text/plain,text/markdown',  'text/html',     '<li><p>More work items underway</p></li>'),
+                    ('text/html,text/plain,text/markdown',  'text/html',     '<li>\n<p>More work items underway</p>\n</li>'),
                     ('text/markdown,text/html,text/plain',  'text/markdown', '1. More work items underway'),
                     ('text/plain,text/markdown, text/html', 'text/plain',    '1. More work items underway'),
-                    ('text/html',                           'text/html',     '<li><p>More work items underway</p></li>'),
+                    ('text/html',                           'text/html',     '<li>\n<p>More work items underway</p>\n</li>'),
                     ('text/markdown',                       'text/markdown', '1. More work items underway'),
                     ('text/plain',                          'text/plain',    '1. More work items underway'),
                 ]:
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
@@ -14,7 +14,7 @@
 import re
 import tarfile
 import tempfile
-import markdown2
+import markdown
 
 from calendar import timegm
 from collections import OrderedDict, Counter, deque, defaultdict
@@ -261,7 +261,7 @@ def materials_document(request, document, num=None, ext=None):
                     content_type = content_type.replace('plain', 'markdown', 1)
                     break;
                 elif atype[0] == 'text/html':
-                    bytes = "<html>\n<head></head>\n<body>\n%s\n</body>\n</html>\n" % markdown2.markdown(bytes)
+                    bytes = "<html>\n<head></head>\n<body>\n%s\n</body>\n</html>\n" % markdown.markdown(bytes.decode(),extensions=['extra'])
                     content_type = content_type.replace('plain', 'html', 1)
                     break;
                 elif atype[0] == 'text/plain':
diff --git a/requirements.txt b/requirements.txt
@@ -39,7 +39,6 @@ jwcrypto>=0.4.0			# for signed notifications
 logging_tree>=1.8.1
 lxml>=3.4.0,<5
 markdown>=3.3.4
-markdown2>=2.3.8
 mock>=2.0.0
 mypy>=0.782,<0.790			# Version requirements determined by django-stubs.
 mysqlclient>=1.3.13,!=2.0.2
