From 19cbfc9cfe5dfb0a484322d8fda77b0382335161 Mon Sep 17 00:00:00 2001 From: miruka Date: Fri, 30 Aug 2019 00:07:41 -0400 Subject: [PATCH] Fix html_filter.py for html_sanitizer 1.7.3 --- TODO.md | 5 +++++ src/python/html_filter.py | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index c703d0ac..096e9358 100644 --- a/TODO.md +++ b/TODO.md @@ -11,6 +11,7 @@ - When qml syntax highlighting supports ES6 string interpolation, use them - Fixes + - Greentext for local echo - Show error if uploading avatar fails - Don't strip user spacing in html @@ -22,6 +23,7 @@ - Terrible performance using `QT_QPA_PLATFORM=wayland-egl`, must use `xcb` - UI + - Reduce icons brightness - Restore previous focus after closing right click context menu - Choose a better default easing type for animations - Make HListView scrollbars visible @@ -113,6 +115,9 @@ - Links preview - Client improvements + - Prevent starting multiple instances, causes problems with E2E DB + (sending new messages from second instances makes them undecryptable to + first instance until it's restarted) - `translated` arg for avatar upload and login errors - Check if username exists on login screen - `pyotherside.atexit()` diff --git a/src/python/html_filter.py b/src/python/html_filter.py index 3738ff9d..53933073 100644 --- a/src/python/html_filter.py +++ b/src/python/html_filter.py @@ -26,8 +26,9 @@ class HtmlFilter: self._inline_sanitizer = Sanitizer(self.sanitize_settings(inline=True)) # The whitespace remover doesn't take 
 into account
-        sanitizer.normalize_overall_whitespace         = lambda html: html
-        sanitizer.normalize_whitespace_in_text_or_tail = lambda el: el
+        sanitizer.normalize_overall_whitespace = lambda html, *args, **kw: html
+        sanitizer.normalize_whitespace_in_text_or_tail = \
+            lambda el, *args, **kw: el
 
         # hard_wrap: convert all \n to 
 without required two spaces
         self._markdown_to_html = mistune.Markdown(