Merge branch 'master' into gssapi-py3-support

Conflicts:
	.gitignore
	README
	demos/demo_simple.py
	dev-requirements.txt
	paramiko/__init__.py
	paramiko/_winapi.py
	paramiko/agent.py
	paramiko/auth_handler.py
	paramiko/ber.py
	paramiko/buffered_pipe.py
	paramiko/channel.py
	paramiko/client.py
	paramiko/common.py
	paramiko/dsskey.py
	paramiko/ecdsakey.py
	paramiko/file.py
	paramiko/hostkeys.py
	paramiko/kex_gex.py
	paramiko/kex_group1.py
	paramiko/message.py
	paramiko/packet.py
	paramiko/pkey.py
	paramiko/primes.py
	paramiko/proxy.py
	paramiko/py3compat.py
	paramiko/server.py
	paramiko/sftp_client.py
	paramiko/transport.py
	paramiko/util.py
	paramiko/win_pageant.py
	setup.py
	sites/shared_conf.py
	sites/www/changelog.rst
	sites/www/conf.py
	sites/www/index.rst
	sites/www/installing.rst
	test.py
	tests/loop.py
	tests/stub_sftp.py
	tests/test_auth.py
	tests/test_client.py
	tests/test_file.py
	tests/test_hostkeys.py
	tests/test_kex.py
	tests/test_message.py
	tests/test_packetizer.py
	tests/test_pkey.py
	tests/test_sftp.py
	tests/test_sftp_big.py
	tests/test_transport.py
	tests/test_util.py

1 files changed, 6 insertions, 8 deletions

diff --git a/tests/test_buffered_pipe.py b/tests/test_buffered_pipe.py
index b9d2bef4..b66edff9 100644
--- a/tests/test_buffered_pipe.py
+++ b/tests/test_buffered_pipe.py
@@ -22,7 +22,6 @@ Some unit tests for BufferedPipe.
 
 import threading
 import time
-import unittest
 from paramiko.buffered_pipe import BufferedPipe, PipeTimeout
 from paramiko import pipe
 from paramiko.py3compat import b
@@ -30,16 +29,16 @@ from paramiko.py3compat import b
 from tests.util import ParamikoTest
 
 
-def delay_thread(pipe):
-    pipe.feed('a')
+def delay_thread(p):
+    p.feed('a')
     time.sleep(0.5)
-    pipe.feed('b')
-    pipe.close()
+    p.feed('b')
+    p.close()
 
 
-def close_thread(pipe):
+def close_thread(p):
     time.sleep(0.2)
-    pipe.close()
+    p.close()
 
 
 class BufferedPipeTest(ParamikoTest):
@@ -91,4 +90,3 @@ class BufferedPipeTest(ParamikoTest):
         self.assertTrue(p._set)
         p2.clear()
         self.assertFalse(p._set)
-