Merge pull request #557 from simondeziel/needrestart

integration: avoid needrestart from prompting

integration/run-integration-tests

@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 sudo apt-get update
-sudo apt-get install -y --no-install-recommends \
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
      build-essential \
      busybox-static \
      libffi-dev \

pylxd/deprecated/container.py

@@ -116,8 +116,7 @@ def get_container_config(self, container):
     def get_container_websocket(self, container):
         return self.connection.get_status(
             "GET",
-            "/1.0/operations/%s/websocket?secret=%s"
-            % (container["operation"], container["fs"]),
+            f"/1.0/operations/{container['operation']}/websocket?secret={container['fs']}",
         )
 
     def container_info(self, container):

pylxd/models/_model.py

@@ -73,10 +73,10 @@ def __new__(cls, name, bases, attrs):
                 attributes.update(base.__attributes__)
 
         for key, val in attrs.items():
-            if type(val) == Attribute:
+            if isinstance(val, Attribute):
                 attributes[key] = val
                 for_removal.append(key)
-            if type(val) in (Manager, Parent):
+            if isinstance(val, Manager) or isinstance(val, Parent):
                 managers.append(key)
                 for_removal.append(key)
         for key in for_removal:

pylxd/models/instance.py

@@ -307,7 +307,7 @@ def all(cls, client, recursion=0):
 
         instances = []
         for instance in response.json()["metadata"]:
-            if type(instance) == dict:
+            if isinstance(instance, dict):
                 # User specified recursion so returning all data for each instance at once
                 instance_class = cls(client, name=instance["name"])
                 for key, data in instance.items():
@@ -793,7 +793,7 @@ def __init__(self, url, payload=None, **kwargs):
         super().__init__(url, **kwargs)
 
     def _smart_encode(self, msg):
-        if type(msg) == str and self.encoding:
+        if isinstance(msg, str) and self.encoding:
             return msg.encode(self.encoding)
         return msg