properly clean up the fileclient in extmods

salt/fileclient.py

@@ -1460,6 +1460,12 @@ class RemoteClient(Client):
             load["tok"] = self.auth.gen_token(b"salt")
         return self.channel.send(load)
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        self.destroy()
+
 
 class FSClient(RemoteClient):
     """

salt/transport/zeromq.py

@@ -541,12 +541,6 @@ class AsyncReqMessageClient:
             if self.context.closed is False:
                 self.context.term()
 
-    # pylint: disable=W1701
-    def __del__(self):
-        self.close()
-
-    # pylint: enable=W1701
-
     def _init_socket(self):
         if hasattr(self, "stream"):
             self.stream.close()  # pylint: disable=E0203

salt/utils/extmods.py

@@ -81,15 +81,16 @@ def sync(opts, form, saltenv=None, extmod_whitelist=None, extmod_blacklist=None)
                 cache = []
                 log.info("Loading cache from %s, for %s", source, sub_env)
                 # Grab only the desired files (.py, .pyx, .so)
-                cache.extend(
-                    fileclient.cache_dir(
-                        source,
-                        sub_env,
-                        include_empty=False,
-                        include_pat=r"E@\.(pyx?|so|zip)$",
-                        exclude_pat=None,
+                with fileclient:
+                    cache.extend(
+                        fileclient.cache_dir(
+                            source,
+                            sub_env,
+                            include_empty=False,
+                            include_pat=r"E@\.(pyx?|so|zip)$",
+                            exclude_pat=None,
+                        )
                     )
-                )
                 local_cache_dir = os.path.join(
                     opts["cachedir"], "files", sub_env, "_{}".format(form)
                 )