Merge branch 'master' into switch-to-cryptography

Conflicts:
	paramiko/ecdsakey.py
	tests/test_client.py

1 files changed, 9 insertions, 0 deletions

diff --git a/paramiko/util.py b/paramiko/util.py
index f966099d..25062d00 100644
--- a/paramiko/util.py
+++ b/paramiko/util.py
@@ -290,5 +290,14 @@ def constant_time_bytes_eq(a, b):
         res |= byte_ord(a[i]) ^ byte_ord(b[i])
     return res == 0
 
+
+class ClosingContextManager(object):
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+
 def clamp_value(minimum, val, maximum):
     return max(minimum, min(val, maximum))