mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Avoid problem resolving 'localhost'

Browse source 
M PyShell.py
M rpc.py
M run.py
This commit is contained in:
Kurt B. Kaiser 2003-06-05 23:51:29 +00:00
parent 852f35bbeb
commit 24d7e0cbb8
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/idlelib/PyShell.py
View file

@ -35,6 +35,7 @@ import Debugger
import RemoteDebugger import RemoteDebugger
IDENTCHARS = string.ascii_letters + string.digits + "_" IDENTCHARS = string.ascii_letters + string.digits + "_"
LOCALHOST = '127.0.0.1'
try: try:
from signal import SIGTERM from signal import SIGTERM
@ -336,7 +337,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
return [sys.executable] + w + ["-c", command, str(self.port)] return [sys.executable] + w + ["-c", command, str(self.port)]
def start_subprocess(self): def start_subprocess(self):
addr = ("localhost", self.port) addr = (LOCALHOST, self.port)
# Idle starts listening for connection on localhost # Idle starts listening for connection on localhost
for i in range(3): for i in range(3):
time.sleep(i) time.sleep(i)

5
Lib/idlelib/rpc.py
View file

@ -64,6 +64,7 @@ copy_reg.pickle(types.CodeType, pickle_code, unpickle_code)
# copy_reg.pickle(types.FunctionType, pickle_function, unpickle_function) # copy_reg.pickle(types.FunctionType, pickle_function, unpickle_function)
BUFSIZE = 8*1024 BUFSIZE = 8*1024
LOCALHOST = '127.0.0.1'
class RPCServer(SocketServer.TCPServer): class RPCServer(SocketServer.TCPServer):
@ -525,7 +526,7 @@ class RPCClient(SocketIO):
working_sock, address = self.listening_sock.accept() working_sock, address = self.listening_sock.accept()
if self.debugging: if self.debugging:
print>>sys.__stderr__, "****** Connection request from ", address print>>sys.__stderr__, "****** Connection request from ", address
if address[0] == '127.0.0.1': if address[0] == LOCALHOST:
SocketIO.__init__(self, working_sock) SocketIO.__init__(self, working_sock)
else: else:
print>>sys.__stderr__, "** Invalid host: ", address print>>sys.__stderr__, "** Invalid host: ", address
@ -655,7 +656,7 @@ def testClient(addr):
# clt.remotecall("thomas","greet_this_guy",("alexander",), {}) # clt.remotecall("thomas","greet_this_guy",("alexander",), {})
def test(): def test():
addr=("localhost",8833) addr=(LOCALHOST, 8833)
if len(sys.argv) == 2: if len(sys.argv) == 2:
if sys.argv[1]=='-server': if sys.argv[1]=='-server':
testServer(addr) testServer(addr)

4
Lib/idlelib/run.py
View file

@ -17,6 +17,8 @@ import interrupt
import __main__ import __main__
LOCALHOST = '127.0.0.1'
# Thread shared globals: Establish a queue between a subthread (which handles # Thread shared globals: Establish a queue between a subthread (which handles
# the socket) and the main thread (which runs user code), plus global # the socket) and the main thread (which runs user code), plus global
# completion and exit flags: # completion and exit flags:
@ -52,7 +54,7 @@ def main(del_exitfunc=False):
sys.argv[:] = [""] sys.argv[:] = [""]
sockthread = threading.Thread(target=manage_socket, sockthread = threading.Thread(target=manage_socket,
name='SockThread', name='SockThread',
args=(('localhost', port),)) args=((LOCALHOST, port),))
sockthread.setDaemon(True) sockthread.setDaemon(True)
sockthread.start() sockthread.start()
while 1: while 1: