Refactor Code Expression

docker/context/context.py

@@ -205,9 +205,7 @@ def Orchestrator(self):
 
     @property
     def Metadata(self):
-        meta = {}
-        if self.orchestrator:
-            meta = {"StackOrchestrator": self.orchestrator}
+        meta = {"StackOrchestrator": self.orchestrator} if self.orchestrator else {}
         return {
             "Name": self.name,
             "Metadata": meta,

docker/models/plugins.py

@@ -180,7 +180,7 @@ def install(self, remote_name, local_name=None):
         """
         privileges = self.client.api.plugin_privileges(remote_name)
         it = self.client.api.pull_plugin(remote_name, privileges, local_name)
-        for data in it:
+        for _ in it:
             pass
         return self.get(local_name or remote_name)
 

docker/models/swarm.py

@@ -121,8 +121,9 @@ def init(self, advertise_addr=None, listen_addr='0.0.0.0:2377',
             'default_addr_pool': default_addr_pool,
             'subnet_size': subnet_size,
             'data_path_addr': data_path_addr,
+            'swarm_spec': self.client.api.create_swarm_spec(**kwargs),
         }
-        init_kwargs['swarm_spec'] = self.client.api.create_swarm_spec(**kwargs)
+
         node_id = self.client.api.init_swarm(**init_kwargs)
         self.reload()
         return node_id

docker/types/daemon.py

@@ -42,33 +42,35 @@ def close(self):
         Closes the event streaming.
         """
 
-        if not self._response.raw.closed:
-            # find the underlying socket object
-            # based on api.client._get_raw_response_socket
+        if self._response.raw.closed:
+            return
 
-            sock_fp = self._response.raw._fp.fp
+        # find the underlying socket object
+        # based on api.client._get_raw_response_socket
 
-            if hasattr(sock_fp, 'raw'):
-                sock_raw = sock_fp.raw
+        sock_fp = self._response.raw._fp.fp
 
-                if hasattr(sock_raw, 'sock'):
-                    sock = sock_raw.sock
+        if hasattr(sock_fp, 'raw'):
+            sock_raw = sock_fp.raw
 
-                elif hasattr(sock_raw, '_sock'):
-                    sock = sock_raw._sock
+            if hasattr(sock_raw, 'sock'):
+                sock = sock_raw.sock
 
-            elif hasattr(sock_fp, 'channel'):
-                # We're working with a paramiko (SSH) channel, which doesn't
-                # support cancelable streams with the current implementation
-                raise DockerException(
-                    'Cancellable streams not supported for the SSH protocol'
-                )
-            else:
-                sock = sock_fp._sock
+            elif hasattr(sock_raw, '_sock'):
+                sock = sock_raw._sock
 
-            if hasattr(urllib3.contrib, 'pyopenssl') and isinstance(
-                    sock, urllib3.contrib.pyopenssl.WrappedSocket):
-                sock = sock.socket
+        elif hasattr(sock_fp, 'channel'):
+            # We're working with a paramiko (SSH) channel, which doesn't
+            # support cancelable streams with the current implementation
+            raise DockerException(
+                'Cancellable streams not supported for the SSH protocol'
+            )
+        else:
+            sock = sock_fp._sock
 
-            sock.shutdown(socket.SHUT_RDWR)
-            sock.close()
+        if hasattr(urllib3.contrib, 'pyopenssl') and isinstance(
+                sock, urllib3.contrib.pyopenssl.WrappedSocket):
+            sock = sock.socket
+
+        sock.shutdown(socket.SHUT_RDWR)
+        sock.close()

docker/utils/socket.py

@@ -146,11 +146,10 @@ def consume_socket_output(frames, demux=False):
                 out[0] = frame[0]
             else:
                 out[0] += frame[0]
+        elif out[1] is None:
+            out[1] = frame[1]
         else:
-            if out[1] is None:
-                out[1] = frame[1]
-            else:
-                out[1] += frame[1]
+            out[1] += frame[1]
     return tuple(out)