Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix typo with regards to self.PORT shadowing class variables with the same name.

This commit is contained in:
Trent Nelson 2008-04-09 00:34:53 +00:00
parent 79e42a0e08
commit 6c4a7c6821
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/test/test_httplib.py
View File

@ -203,7 +203,7 @@ class TimeoutTest(TestCase):
def setUp(self):
self.serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.PORT = test_support.bind_port(self.serv)
TimeoutTest.PORT = test_support.bind_port(self.serv)
self.serv.listen(5)
def tearDown(self):
@ -215,13 +215,13 @@ class TimeoutTest(TestCase):
HTTPConnection and into the socket.
'''
# default
httpConn = httplib.HTTPConnection(HOST, self.PORT)
httpConn = httplib.HTTPConnection(HOST, TimeoutTest.PORT)
httpConn.connect()
self.assertTrue(httpConn.sock.gettimeout() is None)
httpConn.close()
# a value
httpConn = httplib.HTTPConnection(HOST, self.PORT, timeout=30)
httpConn = httplib.HTTPConnection(HOST, TimeoutTest.PORT, timeout=30)
httpConn.connect()
self.assertEqual(httpConn.sock.gettimeout(), 30)
httpConn.close()
@ -230,7 +230,8 @@ class TimeoutTest(TestCase):
previous = socket.getdefaulttimeout()
socket.setdefaulttimeout(30)
try:
httpConn = httplib.HTTPConnection(HOST, self.PORT, timeout=None)
httpConn = httplib.HTTPConnection(HOST, TimeoutTest.PORT,
timeout=None)
httpConn.connect()
finally:
socket.setdefaulttimeout(previous)

6
Lib/test/test_socket_ssl.py
View File

@ -212,8 +212,8 @@ class OpenSSLServer(threading.Thread):
try:
# XXX TODO: on Windows, this should make more effort to use the
# openssl.exe that would have been built by the pcbuild.sln.
self.PORT = test_support.find_unused_port()
args = (self.PORT, cert_file, key_file)
OpenSSLServer.PORT = test_support.find_unused_port()
args = (OpenSSLServer.PORT, cert_file, key_file)
cmd = "openssl s_server -accept %d -cert %s -key %s -quiet" % args
self.s = subprocess.Popen(cmd.split(), stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
@ -225,7 +225,7 @@ class OpenSSLServer(threading.Thread):
# let's try if it is actually up
try:
s = socket.socket()
s.connect((HOST, self.PORT))
s.connect((HOST, OpenSSLServer.PORT))
s.close()
if self.s.stdout.readline() != "ERROR\n":
raise ValueError