diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-06-13 02:00:47 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-06-13 02:00:47 (GMT) |
| commit | b03ca4bc687da31942e3e9e3a923e1c4ebfc4453 (patch) | |
| tree | a0f728ac9592bb20e41cee4e19ec9e1126d9868c /Lib/idlelib | |
| parent | 2d9a086410546ef86358220eab652e03cd5ae5ab (diff) | |
| download | cpython-b03ca4bc687da31942e3e9e3a923e1c4ebfc4453.zip cpython-b03ca4bc687da31942e3e9e3a923e1c4ebfc4453.tar.gz cpython-b03ca4bc687da31942e3e9e3a923e1c4ebfc4453.tar.bz2 | |
fix more threading API related bugs
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/rpc.py | 12 | ||||
| -rw-r--r-- | Lib/idlelib/run.py | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index e555ffb..a749353 100644 --- a/Lib/idlelib/rpc.py +++ b/Lib/idlelib/rpc.py @@ -106,7 +106,7 @@ class RPCServer(socketserver.TCPServer): erf = sys.__stderr__ print('\n' + '-'*40, file=erf) print('Unhandled server exception!', file=erf) - print('Thread: %s' % threading.currentThread().getName(), file=erf) + print('Thread: %s' % threading.current_thread().get_name(), file=erf) print('Client Address: ', client_address, file=erf) print('Request: ', repr(request), file=erf) traceback.print_exc(file=erf) @@ -126,7 +126,7 @@ class SocketIO(object): nextseq = 0 def __init__(self, sock, objtable=None, debugging=None): - self.sockthread = threading.currentThread() + self.sockthread = threading.current_thread() if debugging is not None: self.debugging = debugging self.sock = sock @@ -149,7 +149,7 @@ class SocketIO(object): def debug(self, *args): if not self.debugging: return - s = self.location + " " + str(threading.currentThread().getName()) + s = self.location + " " + str(threading.current_thread().getName()) for a in args: s = s + " " + str(a) print(s, file=sys.__stderr__) @@ -218,7 +218,7 @@ class SocketIO(object): def asynccall(self, oid, methodname, args, kwargs): request = ("CALL", (oid, methodname, args, kwargs)) seq = self.newseq() - if threading.currentThread() != self.sockthread: + if threading.current_thread() != self.sockthread: cvar = threading.Condition() self.cvars[seq] = cvar self.debug(("asynccall:%d:" % seq), oid, methodname, args, kwargs) @@ -228,7 +228,7 @@ class SocketIO(object): def asyncqueue(self, oid, methodname, args, kwargs): request = ("QUEUE", (oid, methodname, args, kwargs)) seq = self.newseq() - if threading.currentThread() != self.sockthread: + if threading.current_thread() != self.sockthread: cvar = threading.Condition() self.cvars[seq] = cvar self.debug(("asyncqueue:%d:" % seq), oid, methodname, args, kwargs) @@ -294,7 +294,7 @@ class SocketIO(object): def _getresponse(self, myseq, wait): self.debug("_getresponse:myseq:", myseq) - if threading.currentThread() is self.sockthread: + if threading.current_thread() is self.sockthread: # this thread does all reading of requests or responses while 1: response = self.pollresponse(myseq, wait) diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py index 7a662c9..e2e9f69 100644 --- a/Lib/idlelib/run.py +++ b/Lib/idlelib/run.py @@ -73,7 +73,7 @@ def main(del_exitfunc=False): sockthread = threading.Thread(target=manage_socket, name='SockThread', args=((LOCALHOST, port),)) - sockthread.setDaemon(True) + sockthread.set_daemon(True) sockthread.start() while 1: try: @@ -227,7 +227,7 @@ class MyRPCServer(rpc.RPCServer): erf = sys.__stderr__ print('\n' + '-'*40, file=erf) print('Unhandled server exception!', file=erf) - print('Thread: %s' % threading.currentThread().getName(), file=erf) + print('Thread: %s' % threading.current_thread().get_name(), file=erf) print('Client Address: ', client_address, file=erf) print('Request: ', repr(request), file=erf) traceback.print_exc(file=erf) |