#18833: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-08-26 00:17:21 +03:00
commit ec42975bc6
2 changed files with 9 additions and 0 deletions

View file

@ -75,6 +75,14 @@ class GeneralTests(TestCase):
self.assertEqual(telnet.sock.gettimeout(), 30) self.assertEqual(telnet.sock.gettimeout(), 30)
telnet.sock.close() 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): class SocketStub(object):
''' a socket proxy that re-defines sendall() ''' ''' a socket proxy that re-defines sendall() '''
def __init__(self, reads=()): def __init__(self, reads=()):

View file

@ -1324,6 +1324,7 @@ Norman Vine
Pauli Virtanen Pauli Virtanen
Frank Visser Frank Visser
Johannes Vogel Johannes Vogel
Alex Volkov
Martijn Vries Martijn Vries
Sjoerd de Vries Sjoerd de Vries
Niki W. Waibel Niki W. Waibel