diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index 2a6b2b4d1..44a32bddd 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -546,10 +546,10 @@ class MeetingTests(BaseMeetingTestCase): 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', '
  • More work items underway

  • '), + ('text/html,text/plain,text/markdown', 'text/html', '
  • \n

    More work items underway

    \n
  • '), ('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', '
  • More work items underway

  • '), + ('text/html', 'text/html', '
  • \n

    More work items underway

    \n
  • '), ('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 index b9c4beb5d..4833b3216 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -14,7 +14,7 @@ import pytz 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 = "\n\n\n%s\n\n\n" % markdown2.markdown(bytes) + bytes = "\n\n\n%s\n\n\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 index acb30870f..75bc81f9e 100644 --- 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