collapse spaces after stripping tags

pallets · Feb 2, 2024 · 0b6bee0 · 0b6bee0
1 parent 73e6a48
commit 0b6bee0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,6 +3,8 @@ Version 2.1.5
 
 Unreleased
 
+-   Fix ``striptags`` not collapsing spaces. :issue:`417`
+
 
 Version 2.1.4
 -------------

diff --git a/src/markupsafe/__init__.py b/src/markupsafe/__init__.py
@@ -158,8 +158,7 @@ def striptags(self) -> str:
         >>> Markup("Main &raquo;\t<em>About</em>").striptags()
         'Main » About'
         """
-        # collapse spaces
-        value = " ".join(self.split())
+        value = str(self)
 
         # Look for comments then tags separately. Otherwise, a comment that
         # contains a tag would end early, leaving some of the comment behind.
@@ -193,6 +192,8 @@ def striptags(self) -> str:
 
             value = f"{value[:start]}{value[end + 1:]}"
 
+        # collapse spaces
+        value = " ".join(value.split())
         return self.__class__(value).unescape()
 
     @classmethod

diff --git a/tests/test_markupsafe.py b/tests/test_markupsafe.py
@@ -73,7 +73,7 @@ def test_escaping(escape):
         Markup(
             "<!-- outer comment -->"
             "<em>Foo &amp; Bar"
-            "<!-- inner comment about <em> -->"
+            " <!-- inner comment about <em> -->\n "
             "</em>"
             "<!-- comment\nwith\nnewlines\n-->"
             "<meta content='tag\nwith\nnewlines'>"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,8 @@ Version 2.1.5 @@
     Unreleased
+    -   Fix ``striptags`` not collapsing spaces. :issue:`417`
     Version 2.1.4
     -------------
@@ Expand Down @@