Merge branch '2.1' into 2.2

Foregoes a handful of unblackened bits to make the merge easier; will
blacken next anyways

1 files changed, 5 insertions, 9 deletions

diff --git a/tests/loop.py b/tests/loop.py
index e805ad96..dd1f5a0c 100644
--- a/tests/loop.py
+++ b/tests/loop.py
@@ -16,21 +16,19 @@
 # along with Paramiko; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
 
-"""
-...
-"""
+import socket
+import threading
 
-import threading, socket
 from paramiko.common import asbytes
 
 
-class LoopSocket (object):
+class LoopSocket(object):
     """
     A LoopSocket looks like a normal socket, but all data written to it is
     delivered on the read-end of another LoopSocket, and vice versa.  It's
     like a software "socketpair".
     """
-    
+
     def __init__(self):
         self.__in_buffer = bytes()
         self.__lock = threading.Lock()
@@ -86,7 +84,7 @@ class LoopSocket (object):
             self.__cv.notifyAll()
         finally:
             self.__lock.release()
-            
+
     def __unlink(self):
         m = None
         self.__lock.acquire()
@@ -98,5 +96,3 @@ class LoopSocket (object):
             self.__lock.release()
         if m is not None:
             m.__unlink()
-
-