From: Claudius Heine Date: Mon, 24 Oct 2022 11:24:19 +0200 Subject: Fix test_menu_construct_from_none test case When `menu(None)` is called, this exception happens: File "/tmp/pystray-0.19.4/lib/pystray/_base.py", line 661, in cleaned if not i.visible: AttributeError: 'NoneType' object has no attribute 'visible' Adding an `not i or` before that condition will make sure that `None` will be considered as not visible. The test itself fails as well: File "/tmp/pystray-0.19.4/tests/menu_descriptor_tests.py", line 85, in test_menu_construct_from_none self.assertEqual( AssertionError: '' != '\n' Instead just compare if `str(menu(None))` is the empty string. [Upstream-Status: submitted(https://github.com/moses-palmer/pystray/pull/133)] --- lib/pystray/_base.py | 2 +- tests/menu_descriptor_tests.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) --- a/lib/pystray/_base.py +++ b/lib/pystray/_base.py @@ -662,7 +662,7 @@ def cleaned(items): was_separator = False for i in items: - if not i.visible: + if not i or not i.visible: continue if i is self.SEPARATOR: --- a/tests/menu_descriptor_tests.py +++ b/tests/menu_descriptor_tests.py @@ -83,8 +83,7 @@ """Tests menu construction. """ self.assertEqual( - '', - '\n' + str(menu(None))) + '', str(menu(None))) def test_menu_construct_with_submenu(self): """Tests menu construction.