From 24d7e0cbb8b978738f223d4bb6cb184054d72e18 Mon Sep 17 00:00:00 2001 From: "Kurt B. Kaiser" Date: Thu, 5 Jun 2003 23:51:29 +0000 Subject: Avoid problem resolving 'localhost' M PyShell.py M rpc.py M run.py --- Lib/idlelib/PyShell.py | 3 ++- Lib/idlelib/rpc.py | 5 +++-- Lib/idlelib/run.py | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index db4a05b..e556af3 100644 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -35,6 +35,7 @@ import Debugger import RemoteDebugger IDENTCHARS = string.ascii_letters + string.digits + "_" +LOCALHOST = '127.0.0.1' try: from signal import SIGTERM @@ -336,7 +337,7 @@ class ModifiedInterpreter(InteractiveInterpreter): return [sys.executable] + w + ["-c", command, str(self.port)] def start_subprocess(self): - addr = ("localhost", self.port) + addr = (LOCALHOST, self.port) # Idle starts listening for connection on localhost for i in range(3): time.sleep(i) diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index 658aaf3..63e0ffa 100644 --- a/Lib/idlelib/rpc.py +++ b/Lib/idlelib/rpc.py @@ -64,6 +64,7 @@ copy_reg.pickle(types.CodeType, pickle_code, unpickle_code) # copy_reg.pickle(types.FunctionType, pickle_function, unpickle_function) BUFSIZE = 8*1024 +LOCALHOST = '127.0.0.1' class RPCServer(SocketServer.TCPServer): @@ -525,7 +526,7 @@ class RPCClient(SocketIO): working_sock, address = self.listening_sock.accept() if self.debugging: print>>sys.__stderr__, "****** Connection request from ", address - if address[0] == '127.0.0.1': + if address[0] == LOCALHOST: SocketIO.__init__(self, working_sock) else: print>>sys.__stderr__, "** Invalid host: ", address @@ -655,7 +656,7 @@ def testClient(addr): # clt.remotecall("thomas","greet_this_guy",("alexander",), {}) def test(): - addr=("localhost",8833) + addr=(LOCALHOST, 8833) if len(sys.argv) == 2: if sys.argv[1]=='-server': testServer(addr) diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py index 8b1555d..5e86e47 100644 --- a/Lib/idlelib/run.py +++ b/Lib/idlelib/run.py @@ -17,6 +17,8 @@ import interrupt import __main__ +LOCALHOST = '127.0.0.1' + # Thread shared globals: Establish a queue between a subthread (which handles # the socket) and the main thread (which runs user code), plus global # completion and exit flags: @@ -52,7 +54,7 @@ def main(del_exitfunc=False): sys.argv[:] = [""] sockthread = threading.Thread(target=manage_socket, name='SockThread', - args=(('localhost', port),)) + args=((LOCALHOST, port),)) sockthread.setDaemon(True) sockthread.start() while 1: -- cgit v0.12