[Python-checkins] cpython (merge 3.3 -> default): #18833: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/a4ec11e0fb87
changeset:   85401:a4ec11e0fb87
parent:      85398:becbb65074e1
parent:      85400:1b42e483e520
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon Aug 26 00:17:21 2013 +0300
summary:
  #18833: merge with 3.3.

files:
  Lib/test/test_telnetlib.py |  8 ++++++++
  Misc/ACKS                  |  1 +
  2 files changed, 9 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py
--- a/Lib/test/test_telnetlib.py
+++ b/Lib/test/test_telnetlib.py
@@ -75,6 +75,14 @@
         self.assertEqual(telnet.sock.gettimeout(), 30)
         telnet.sock.close()
 
+    def testGetters(self):
+        # Test telnet getter methods
+        telnet = telnetlib.Telnet(HOST, self.port, timeout=30)
+        t_sock = telnet.sock
+        self.assertEqual(telnet.get_socket(), t_sock)
+        self.assertEqual(telnet.fileno(), t_sock.fileno())
+        telnet.sock.close()
+
 class SocketStub(object):
     ''' a socket proxy that re-defines sendall() '''
     def __init__(self, reads=()):
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1324,6 +1324,7 @@
 Pauli Virtanen
 Frank Visser
 Johannes Vogel
+Alex Volkov
 Martijn Vries
 Sjoerd de Vries
 Niki W. Waibel

-- 
Repository URL: http://hg.python.org/cpython