appmenus: tweak style to match existing codebase conventions

Author: Jayant-kernel

qubesappmenus/__init__.py

@@ -510,11 +510,10 @@ def appmenus_remove(self, vm, refresh_cache=True):
 
     @staticmethod
     def _remove_menu_files(vm):
-        """Remove leftover .menu files from ~/.config/menus/applications-merged/.
+        """Remove .menu files for a VM from ~/.config/menus/applications-merged/
 
-        xdg-desktop-menu uninstall may not clean these up reliably (errors are
-        suppressed, and accumulated installs can leave residual entries).
-        Explicitly remove the known .menu file paths for this VM.
+        xdg-desktop-menu uninstall does not always clean these up (errors
+        are suppressed, partial installs can leave entries behind).
         """
         menus_dir = os.path.join(xdg.BaseDirectory.xdg_config_home,
                                  'menus', 'applications-merged')
@@ -523,11 +522,10 @@ def _remove_menu_files(vm):
         vm_name = str(vm)
         escaped = vm_name_escape(vm_name)
         for prefix in ('qubes-vm-directory', 'qubes-dispvm-directory'):
-            # current format (escaped VM name)
             with contextlib.suppress(FileNotFoundError):
                 os.unlink(os.path.join(menus_dir,
                                        'user-' + prefix + escaped + '.menu'))
-            # old format (raw dash-separated name, pre-escaping era)
+            # also try old format (before VM name escaping was introduced)
             with contextlib.suppress(FileNotFoundError):
                 os.unlink(os.path.join(menus_dir,
                                        'user-' + prefix + '-' + vm_name + '.menu'))

qubesappmenus/tests.py

@@ -24,6 +24,7 @@
 
 import io
 import os
+import shutil
 import tempfile
 import sys
 
@@ -728,7 +729,7 @@ def test_131_set_get_default_whitelist(self, mock_subprocess):
 
 
     @unittest.mock.patch('subprocess.check_call')
-    def test_140_remove_appvm_cleans_menu_file(self, mock_subprocess):
+    def test_140_remove_cleans_menu_files(self, mock_subprocess):
         tpl = TestVM('test-inst-tpl',
             klass='TemplateVM',
             virt_mode='pvh',
@@ -746,20 +747,20 @@ def test_140_remove_appvm_cleans_menu_file(self, mock_subprocess):
         self.ext.appmenus_init(appvm)
         self.ext.appmenus_create(appvm, refresh_cache=False)
 
-        # Simulate leftover .menu files left by xdg-desktop-menu install
         config_dir = tempfile.mkdtemp()
         try:
             menus_dir = os.path.join(config_dir, 'menus', 'applications-merged')
             os.makedirs(menus_dir)
             escaped = qubesappmenus.vm_name_escape(appvm.name)
+            # current-format .menu file
             menu_file = os.path.join(menus_dir,
-                                     'user-qubes-vm-directory' + escaped + '.menu')
+                'user-qubes-vm-directory' + escaped + '.menu')
+            # old-format .menu file (pre-escaping)
             old_menu_file = os.path.join(menus_dir,
-                                         'user-qubes-vm-directory-' + appvm.name + '.menu')
-            with open(menu_file, 'w', encoding='utf-8') as f:
-                f.write('<Menu/>\n')
-            with open(old_menu_file, 'w', encoding='utf-8') as f:
-                f.write('<Menu/>\n')
+                'user-qubes-vm-directory-' + appvm.name + '.menu')
+            for path in (menu_file, old_menu_file):
+                with open(path, 'w', encoding='utf-8') as f:
+                    f.write('<Menu/>\n')
 
             with unittest.mock.patch('xdg.BaseDirectory.xdg_config_home',
                                      config_dir):