From 0b6fe0443d1c5fdebc251880f365c285ac247a6f Mon Sep 17 00:00:00 2001
From: Nikolas Nyby <nikolas@gnu.org>
Date: Wed, 12 Jun 2024 14:55:05 -0400
Subject: [PATCH] Remove django-markwhat, introduce markdownify

---
 pageblocks/templates/pageblocks/imageblock.html          | 8 ++++----
 pageblocks/templates/pageblocks/imagepullquoteblock.html | 4 ++--
 pageblocks/templates/pageblocks/pullquoteblock.html      | 4 ++--
 pageblocks/templates/pageblocks/simpleimageblock.html    | 4 ++--
 pageblocks/templates/pageblocks/textblock.html           | 4 ++--
 setup.py                                                 | 6 +++---
 test_reqs.txt                                            | 3 +--
 7 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/pageblocks/templates/pageblocks/imageblock.html b/pageblocks/templates/pageblocks/imageblock.html
index f37b57c..f8850a5 100644
--- a/pageblocks/templates/pageblocks/imageblock.html
+++ b/pageblocks/templates/pageblocks/imageblock.html
@@ -1,4 +1,4 @@
-{% load markup %}
+{% load markdownify %}
 {% load thumbnail %}
 
 {% if block.lightbox %}
@@ -17,7 +17,7 @@ <h3 class="modal-title">{{block.alt}}</h3>
 			<div class="modal-body">
 				<img alt="{{block.alt}}" src="{% if img_src %}{{img_src}}{% else %}{% thumbnail block.image 900x900 %}{% endif %}" />
 				<div class="caption">
-					{{block.caption|markdown}}
+					{{block.caption|markdownify}}
 				</div>
 			</div>
 		</div>
@@ -32,7 +32,7 @@ <h3 class="modal-title">{{block.alt}}</h3>
 						 src="{% if img_src %}{{img_src}}{% else %}{% thumbnail block.image 200x200 %}{% endif %}" />
 			</a>
 			<div class="caption">
-				{{block.caption|markdown}}
+				{{block.caption|markdownify}}
 			</div>
 		</div>
 	</li>
@@ -41,6 +41,6 @@ <h3 class="modal-title">{{block.alt}}</h3>
 {% else %}
 <img alt="{{block.alt}}" src="{% if img_src %}{{img_src}}{% else %}{% thumbnail block.image 600x600 %}{% endif %}" />
 <div class="caption">
-{{block.caption|markdown}}
+{{block.caption|markdownify}}
 </div>
 {% endif %}
diff --git a/pageblocks/templates/pageblocks/imagepullquoteblock.html b/pageblocks/templates/pageblocks/imagepullquoteblock.html
index 0be036c..f47dc1f 100644
--- a/pageblocks/templates/pageblocks/imagepullquoteblock.html
+++ b/pageblocks/templates/pageblocks/imagepullquoteblock.html
@@ -1,11 +1,11 @@
-{% load markup %}
+{% load markdownify %}
 {% load thumbnail %}
 <ul class="thumbnails">
 <li class="span6">
 <div class="thumbnail">
 <img alt="{{block.alt}}" src="{% if img_src %}{{img_src}}{% else %}{% thumbnail block.image 260x180 %}{% endif %}" /><br />
 <div class="caption">
-{{block.caption|markdown}}
+{{block.caption|markdownify}}
 </div>
 </div>
 </li>
diff --git a/pageblocks/templates/pageblocks/pullquoteblock.html b/pageblocks/templates/pageblocks/pullquoteblock.html
index 5072d89..405d7a3 100644
--- a/pageblocks/templates/pageblocks/pullquoteblock.html
+++ b/pageblocks/templates/pageblocks/pullquoteblock.html
@@ -1,2 +1,2 @@
-{% load markup %}
-<div class="pullquote">{{block.body|markdown}}</div>
+{% load markdownify %}
+<div class="pullquote">{{block.body|markdownify}}</div>
diff --git a/pageblocks/templates/pageblocks/simpleimageblock.html b/pageblocks/templates/pageblocks/simpleimageblock.html
index da264a4..fbc106a 100644
--- a/pageblocks/templates/pageblocks/simpleimageblock.html
+++ b/pageblocks/templates/pageblocks/simpleimageblock.html
@@ -1,11 +1,11 @@
-{% load markup %}
+{% load markdownify %}
 <div class="{{block.css_extra}}">
     <img alt="{{block.alt}}"
          class="img-responsive"
          src="{{MEDIA_URL}}{{block.image.name}}" />
     {% if block.caption %}
     <div class="caption">
-        {{block.caption|markdown}}
+        {{block.caption|markdownify}}
     </div>
     {% endif %}
 </div>
diff --git a/pageblocks/templates/pageblocks/textblock.html b/pageblocks/templates/pageblocks/textblock.html
index 0185b9e..e41766c 100644
--- a/pageblocks/templates/pageblocks/textblock.html
+++ b/pageblocks/templates/pageblocks/textblock.html
@@ -1,2 +1,2 @@
-{% load markup %}
-{{block.body|markdown}}
+{% load markdownify %}
+{{block.body|markdownify}}
diff --git a/setup.py b/setup.py
index ed8673d..9d3ece6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2015, Columbia Center For New Media Teaching And Learning (CCNMTL)
+# Copyright (c) 2007-2024, Columbia Center For Teaching And Learning (CTL)
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,7 @@
     install_requires = [
         "django-pagetree>=1.1.0",
         "sorl>=3.1",
+        "django-markdownify",
     ],
     scripts = [],
     license = "BSD",
@@ -43,5 +44,4 @@
     zip_safe=False,
     packages=['pageblocks'],
     include_package_data=True,
-
-    )
+)
diff --git a/test_reqs.txt b/test_reqs.txt
index 0ccaf02..731702f 100644
--- a/test_reqs.txt
+++ b/test_reqs.txt
@@ -1,6 +1,4 @@
 django-treebeard==4.7.1
-Markdown==3.6
-django-markwhat==1.6.2
 django-pagetree==1.5.0
 importlib-metadata<7.2  # for flake8
 typing_extensions==4.12.2
@@ -20,3 +18,4 @@ python-dateutil==2.9.0.post0
 text-unidecode==1.3
 six==1.16.0
 test_reqs/sorl-3.4-py3-none-any.whl
+django-markdownify==0.9.5