Author: Brian Kearns <[email protected]>
Branch: issue1430
Changeset: r71160:9ff62e96a9ed
Date: 2014-05-01 17:51 -0400
http://bitbucket.org/pypy/pypy/changeset/9ff62e96a9ed/
Log: use dummy_lock from rthread
diff --git a/rpython/rlib/rsocket.py b/rpython/rlib/rsocket.py
--- a/rpython/rlib/rsocket.py
+++ b/rpython/rlib/rsocket.py
@@ -18,6 +18,7 @@
from rpython.rlib.objectmodel import instantiate, keepalive_until_here
from rpython.rlib import _rsocket_rffi as _c
from rpython.rlib.rarithmetic import intmask, r_uint
+from rpython.rlib.rthread import dummy_lock
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.rtyper.lltypesystem.rffi import sizeof, offsetof
INVALID_SOCKET = _c.INVALID_SOCKET
@@ -1124,22 +1125,14 @@
paddr = h_addr_list[i]
return (rffi.charp2str(hostent.c_h_name), aliases, address_list)
-class DummyLock(object):
- def __enter__(self):
- pass
-
- def __exit__(self, *args):
- pass
-
-
-def gethostbyname_ex(name, lock=DummyLock()):
+def gethostbyname_ex(name, lock=dummy_lock):
# XXX use gethostbyname_r() if available instead of locks
addr = gethostbyname(name)
with lock:
hostent = _c.gethostbyname(name)
return gethost_common(name, hostent, addr)
-def gethostbyaddr(ip, lock=DummyLock()):
+def gethostbyaddr(ip, lock=dummy_lock):
# XXX use gethostbyaddr_r() if available, instead of locks
addr = makeipaddr(ip)
assert isinstance(addr, IPAddress)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
