diff -r 8d3932671e48 Lib/telnetlib.py
--- a/Lib/telnetlib.py	Wed Oct 28 21:45:01 2015 +0200
+++ b/Lib/telnetlib.py	Wed Oct 28 21:57:53 2015 +0100
@@ -637,6 +637,12 @@
             raise EOFError
         return (-1, None, text)
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
 
 def test():
     """Test program for telnetlib.