Blacken Paramiko on 2.4

1 files changed, 63 insertions, 67 deletions

diff --git a/paramiko/config.py b/paramiko/config.py
index 038d84ea..21c9dab8 100644
--- a/paramiko/config.py
+++ b/paramiko/config.py
@@ -30,7 +30,7 @@ import socket
 SSH_PORT = 22
 
 
-class SSHConfig (object):
+class SSHConfig(object):
     """
     Representation of config information as stored in the format used by
     OpenSSH. Queries can be made via `lookup`. The format is described in
@@ -41,7 +41,7 @@ class SSHConfig (object):
     .. versionadded:: 1.6
     """
 
-    SETTINGS_REGEX = re.compile(r'(\w+)(?:\s*=\s*|\s+)(.+)')
+    SETTINGS_REGEX = re.compile(r"(\w+)(?:\s*=\s*|\s+)(.+)")
 
     def __init__(self):
         """
@@ -55,12 +55,12 @@ class SSHConfig (object):
 
         :param file_obj: a file-like object to read the config file from
         """
-        host = {"host": ['*'], "config": {}}
+        host = {"host": ["*"], "config": {}}
         for line in file_obj:
             # Strip any leading or trailing whitespace from the line.
             # Refer to https://github.com/paramiko/paramiko/issues/499
             line = line.strip()
-            if not line or line.startswith('#'):
+            if not line or line.startswith("#"):
                 continue
 
             match = re.match(self.SETTINGS_REGEX, line)
@@ -69,17 +69,14 @@ class SSHConfig (object):
             key = match.group(1).lower()
             value = match.group(2)
 
-            if key == 'host':
+            if key == "host":
                 self._config.append(host)
-                host = {
-                    'host': self._get_hosts(value),
-                    'config': {}
-                }
-            elif key == 'proxycommand' and value.lower() == 'none':
+                host = {"host": self._get_hosts(value), "config": {}}
+            elif key == "proxycommand" and value.lower() == "none":
                 # Store 'none' as None; prior to 3.x, it will get stripped out
                 # at the end (for compatibility with issue #415). After 3.x, it
                 # will simply not get stripped, leaving a nice explicit marker.
-                host['config'][key] = None
+                host["config"][key] = None
             else:
                 if value.startswith('"') and value.endswith('"'):
                     value = value[1:-1]
@@ -87,13 +84,13 @@ class SSHConfig (object):
                 # identityfile, localforward, remoteforward keys are special
                 # cases, since they are allowed to be specified multiple times
                 # and they should be tried in order of specification.
-                if key in ['identityfile', 'localforward', 'remoteforward']:
-                    if key in host['config']:
-                        host['config'][key].append(value)
+                if key in ["identityfile", "localforward", "remoteforward"]:
+                    if key in host["config"]:
+                        host["config"][key].append(value)
                     else:
-                        host['config'][key] = [value]
-                elif key not in host['config']:
-                    host['config'][key] = value
+                        host["config"][key] = [value]
+                elif key not in host["config"]:
+                    host["config"][key] = value
         self._config.append(host)
 
     def lookup(self, hostname):
@@ -117,25 +114,26 @@ class SSHConfig (object):
         :param str hostname: the hostname to lookup
         """
         matches = [
-            config for config in self._config
-            if self._allowed(config['host'], hostname)
+            config
+            for config in self._config
+            if self._allowed(config["host"], hostname)
         ]
 
         ret = {}
         for match in matches:
-            for key, value in match['config'].items():
+            for key, value in match["config"].items():
                 if key not in ret:
                     # Create a copy of the original value,
                     # else it will reference the original list
                     # in self._config and update that value too
                     # when the extend() is being called.
                     ret[key] = value[:] if value is not None else value
-                elif key == 'identityfile':
+                elif key == "identityfile":
                     ret[key].extend(value)
         ret = self._expand_variables(ret, hostname)
         # TODO: remove in 3.x re #670
-        if 'proxycommand' in ret and ret['proxycommand'] is None:
-            del ret['proxycommand']
+        if "proxycommand" in ret and ret["proxycommand"] is None:
+            del ret["proxycommand"]
         return ret
 
     def get_hostnames(self):
@@ -145,13 +143,13 @@ class SSHConfig (object):
         """
         hosts = set()
         for entry in self._config:
-            hosts.update(entry['host'])
+            hosts.update(entry["host"])
         return hosts
 
     def _allowed(self, hosts, hostname):
         match = False
         for host in hosts:
-            if host.startswith('!') and fnmatch.fnmatch(hostname, host[1:]):
+            if host.startswith("!") and fnmatch.fnmatch(hostname, host[1:]):
                 return False
             elif fnmatch.fnmatch(hostname, host):
                 match = True
@@ -169,52 +167,50 @@ class SSHConfig (object):
         :param str hostname: the hostname that the config belongs to
         """
 
-        if 'hostname' in config:
-            config['hostname'] = config['hostname'].replace('%h', hostname)
+        if "hostname" in config:
+            config["hostname"] = config["hostname"].replace("%h", hostname)
         else:
-            config['hostname'] = hostname
+            config["hostname"] = hostname
 
-        if 'port' in config:
-            port = config['port']
+        if "port" in config:
+            port = config["port"]
         else:
             port = SSH_PORT
 
-        user = os.getenv('USER')
-        if 'user' in config:
-            remoteuser = config['user']
+        user = os.getenv("USER")
+        if "user" in config:
+            remoteuser = config["user"]
         else:
             remoteuser = user
 
-        host = socket.gethostname().split('.')[0]
+        host = socket.gethostname().split(".")[0]
         fqdn = LazyFqdn(config, host)
-        homedir = os.path.expanduser('~')
-        replacements = {'controlpath':
-                        [
-                            ('%h', config['hostname']),
-                            ('%l', fqdn),
-                            ('%L', host),
-                            ('%n', hostname),
-                            ('%p', port),
-                            ('%r', remoteuser),
-                            ('%u', user)
-                        ],
-                        'identityfile':
-                        [
-                            ('~', homedir),
-                            ('%d', homedir),
-                            ('%h', config['hostname']),
-                            ('%l', fqdn),
-                            ('%u', user),
-                            ('%r', remoteuser)
-                        ],
-                        'proxycommand':
-                        [
-                            ('~', homedir),
-                            ('%h', config['hostname']),
-                            ('%p', port),
-                            ('%r', remoteuser)
-                        ]
-                        }
+        homedir = os.path.expanduser("~")
+        replacements = {
+            "controlpath": [
+                ("%h", config["hostname"]),
+                ("%l", fqdn),
+                ("%L", host),
+                ("%n", hostname),
+                ("%p", port),
+                ("%r", remoteuser),
+                ("%u", user),
+            ],
+            "identityfile": [
+                ("~", homedir),
+                ("%d", homedir),
+                ("%h", config["hostname"]),
+                ("%l", fqdn),
+                ("%u", user),
+                ("%r", remoteuser),
+            ],
+            "proxycommand": [
+                ("~", homedir),
+                ("%h", config["hostname"]),
+                ("%p", port),
+                ("%r", remoteuser),
+            ],
+        }
 
         for k in config:
             if config[k] is None:
@@ -265,11 +261,11 @@ class LazyFqdn(object):
 
             # Handle specific option
             fqdn = None
-            address_family = self.config.get('addressfamily', 'any').lower()
-            if address_family != 'any':
+            address_family = self.config.get("addressfamily", "any").lower()
+            if address_family != "any":
                 try:
                     family = socket.AF_INET6
-                    if address_family == 'inet':
+                    if address_family == "inet":
                         socket.AF_INET
                     results = socket.getaddrinfo(
                         self.host,
@@ -277,11 +273,11 @@ class LazyFqdn(object):
                         family,
                         socket.SOCK_DGRAM,
                         socket.IPPROTO_IP,
-                        socket.AI_CANONNAME
+                        socket.AI_CANONNAME,
                     )
                     for res in results:
                         af, socktype, proto, canonname, sa = res
-                        if canonname and '.' in canonname:
+                        if canonname and "." in canonname:
                             fqdn = canonname
                             break
                 # giaerror -> socket.getaddrinfo() can't resolve self.host