Merge branch '2.3' into 2.4

1 files changed, 9 insertions, 9 deletions

diff --git a/paramiko/util.py b/paramiko/util.py
index de4a5647..29c52bfb 100644
--- a/paramiko/util.py
+++ b/paramiko/util.py
@@ -245,16 +245,16 @@ 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"
     frm += " %(name)s: %(message)s"
-    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
@@ -268,9 +268,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):