Merge branch '2.0' into 2.1

5 files changed, 18 insertions, 16 deletions

diff --git a/paramiko/agent.py b/paramiko/agent.py
index d9c998c0..f2b1ecbe 100644
--- a/paramiko/agent.py
+++ b/paramiko/agent.py
@@ -80,8 +80,8 @@ class AgentSSH(object):
     def _send_message(self, msg):
         msg = asbytes(msg)
         self._conn.send(struct.pack(">I", len(msg)) + msg)
-        l = self._read_all(4)
-        msg = Message(self._read_all(struct.unpack(">I", l)[0]))
+        data = self._read_all(4)
+        msg = Message(self._read_all(struct.unpack(">I", data)[0]))
         return ord(msg.get_byte()), msg
 
     def _read_all(self, wanted):
diff --git a/paramiko/auth_handler.py b/paramiko/auth_handler.py
index ef1220cc..a0c38ac6 100644
--- a/paramiko/auth_handler.py
+++ b/paramiko/auth_handler.py
@@ -340,7 +340,7 @@ class AuthHandler(object):
                     m.get_string()  # Lang tag - discarded
                     raise SSHException(
                         "GSS-API Error:\nMajor Status: %s\n\
-                                        Minor Status: %s\ \nError Message:\
+                                        Minor Status: %s\nError Message:\
                                          %s\n"
                     ) % (str(maj_status), str(min_status), err_msg)
                 elif ptype == MSG_USERAUTH_FAILURE:
diff --git a/paramiko/pkey.py b/paramiko/pkey.py
index 9e9da935..255dd66b 100644
--- a/paramiko/pkey.py
+++ b/paramiko/pkey.py
@@ -290,10 +290,10 @@ class PKey(object):
         headers = {}
         start += 1
         while start < len(lines):
-            l = lines[start].split(": ")
-            if len(l) == 1:
+            line = lines[start].split(": ")
+            if len(line) == 1:
                 break
-            headers[l[0].lower()] = l[1].strip()
+            headers[line[0].lower()] = line[1].strip()
             start += 1
         # find end
         end = start
diff --git a/paramiko/util.py b/paramiko/util.py
index 181c3892..256ac7fb 100644
--- a/paramiko/util.py
+++ b/paramiko/util.py
@@ -243,15 +243,15 @@ def get_thread_id():
 def log_to_file(filename, level=DEBUG):
     """send paramiko logs to a logfile,
     if they're not already going somewhere"""
-    l = logging.getLogger("paramiko")
-    if len(l.handlers) > 0:
+    logger = logging.getLogger("paramiko")
+    if len(logger.handlers) > 0:
         return
-    l.setLevel(level)
+    logger.setLevel(level)
     f = open(filename, "a")
-    lh = logging.StreamHandler(f)
+    handler = logging.StreamHandler(f)
     frm = "%(levelname)-.3s [%(asctime)s.%(msecs)03d] thr=%(_threadid)-3d %(name)s: %(message)s"  # noqa
-    lh.setFormatter(logging.Formatter(frm, "%Y%m%d-%H:%M:%S"))
-    l.addHandler(lh)
+    handler.setFormatter(logging.Formatter(frm, "%Y%m%d-%H:%M:%S"))
+    logger.addHandler(handler)
 
 
 # make only one filter object, so it doesn't get applied more than once
@@ -265,9 +265,9 @@ _pfilter = PFilter()
 
 
 def get_logger(name):
-    l = logging.getLogger(name)
-    l.addFilter(_pfilter)
-    return l
+    logger = logging.getLogger(name)
+    logger.addFilter(_pfilter)
+    return logger
 
 
 def retry_on_signal(function):
diff --git a/setup.cfg b/setup.cfg
index bf86db42..7ff383c3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,9 @@ omit = paramiko/_winapi.py
 exclude = sites,.git,build,dist,demos,tests
 # NOTE: W503, E203 are concessions to black 18.0b5 and could be reinstated
 # later if fixed on that end.
-ignore = E124,E125,E128,E261,E301,E302,E303,E402,E721,W503,E203
+# NOTE: E722 seems to only have started popping up on move to flake8 3.6.0 from
+# 2.4.0. Not sure why, bare excepts have been a (regrettable) thing forever...
+ignore = E124,E125,E128,E261,E301,E302,E303,E402,E721,W503,E203,E722
 max-line-length = 79
 
 [tool:pytest]