diff --git a/tests/unittests/unit/net/digest_test.py b/tests/unittests/unit/net/digest_test.py
index c1d7028438..e2c85c8545 100755
--- a/tests/unittests/unit/net/digest_test.py
+++ b/tests/unittests/unit/net/digest_test.py
@@ -5,7 +5,7 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-#pylint: disable=line-too-long
+# pylint: disable=line-too-long
 
 import unittest
 
@@ -13,7 +13,8 @@
     get_digests, get_digest_module,
     choose_digest, gendigest, verify_digest,
     get_salt,
-    )
+)
+
 
 class TestDigest(unittest.TestCase):
 
@@ -28,6 +29,7 @@ def test_invalid_digest(self):
             except TypeError:
                 pass
 
+    # noinspection PyTypeChecker
     def test_all_digests(self):
         for digest in get_digests():
             if digest.startswith("hmac"):
@@ -37,6 +39,7 @@ def test_all_digests(self):
             password = "secret"
             d = gendigest(digest, password, salt)
             assert d is not None
+
             def nvd(password=password, salt=salt, response=d):
                 try:
                     r = verify_digest(digest, password, salt, response)
@@ -46,7 +49,7 @@ def nvd(password=password, salt=salt, response=d):
             nvd(password=None)
             nvd(salt=None)
             nvd(response=None)
-            #truncated:
+            # truncated:
             nvd(password=password[1:])
             nvd(salt=salt[1:])
             nvd(response=d[1:])
@@ -62,5 +65,6 @@ def test_choose_digest(self):
 def main():
     unittest.main()
 
+
 if __name__ == '__main__':
     main()
diff --git a/xpra/gtk/dialogs/base_gui_window.py b/xpra/gtk/dialogs/base_gui_window.py
index e53854bd49..a732c29dba 100644
--- a/xpra/gtk/dialogs/base_gui_window.py
+++ b/xpra/gtk/dialogs/base_gui_window.py
@@ -185,6 +185,7 @@ def ib(self, title="", icon_name="browse.png", tooltip="", callback: Callable =
     def add_widget(self, widget) -> None:
         self.vbox.add(widget)
 
+    # noinspection PyMethodMayBeStatic
     def focus_in(self, window, event) -> None:
         log("focus_in(%s, %s)", window, event)
 
@@ -206,6 +207,7 @@ def quit(self, *args) -> None:
         log("quit%s", args)
         self.do_quit()
 
+    # noinspection PyMethodMayBeStatic
     def do_quit(self) -> None:
         log("do_quit()")
         Gtk.main_quit()
diff --git a/xpra/log.py b/xpra/log.py
index cc12136261..9d733eb07c 100644
--- a/xpra/log.py
+++ b/xpra/log.py
@@ -602,6 +602,7 @@ def flush(self):
             pass
 
     def emit(self, record):
+        # noinspection PyBroadException
         try:
             msg = self.format(record)
             stream = self.stream