Commit ef3e7bf8 authored by Denis Bilenko's avatar Denis Bilenko

socket: use 'raise timeout("timed out")' instead of "raise timeout" to be more like stdlib's socket

parent bb85f7a5
...@@ -133,7 +133,7 @@ def _wait_helper(ev, evtype): ...@@ -133,7 +133,7 @@ def _wait_helper(ev, evtype):
current.switch(ev) current.switch(ev)
def wait_read(fileno, timeout=-1, timeout_exc=_socket.timeout): def wait_read(fileno, timeout=-1, timeout_exc=_socket.timeout('timed out')):
evt = core.read_event(fileno, _wait_helper, timeout, (getcurrent(), timeout_exc)) evt = core.read_event(fileno, _wait_helper, timeout, (getcurrent(), timeout_exc))
try: try:
switch_result = get_hub().switch() switch_result = get_hub().switch()
...@@ -142,7 +142,7 @@ def wait_read(fileno, timeout=-1, timeout_exc=_socket.timeout): ...@@ -142,7 +142,7 @@ def wait_read(fileno, timeout=-1, timeout_exc=_socket.timeout):
evt.cancel() evt.cancel()
def wait_write(fileno, timeout=-1, timeout_exc=_socket.timeout): def wait_write(fileno, timeout=-1, timeout_exc=_socket.timeout('timed out')):
evt = core.write_event(fileno, _wait_helper, timeout, (getcurrent(), timeout_exc)) evt = core.write_event(fileno, _wait_helper, timeout, (getcurrent(), timeout_exc))
try: try:
switch_result = get_hub().switch() switch_result = get_hub().switch()
...@@ -151,7 +151,7 @@ def wait_write(fileno, timeout=-1, timeout_exc=_socket.timeout): ...@@ -151,7 +151,7 @@ def wait_write(fileno, timeout=-1, timeout_exc=_socket.timeout):
evt.cancel() evt.cancel()
def wait_readwrite(fileno, timeout=-1, timeout_exc=timeout): def wait_readwrite(fileno, timeout=-1, timeout_exc=_socket.timeout('timed out')):
evt = core.readwrite_event(fileno, _wait_helper, timeout, (getcurrent(), timeout_exc)) evt = core.readwrite_event(fileno, _wait_helper, timeout, (getcurrent(), timeout_exc))
try: try:
switch_result = get_hub().switch() switch_result = get_hub().switch()
...@@ -296,7 +296,7 @@ class socket(object): ...@@ -296,7 +296,7 @@ class socket(object):
elif (result in (EWOULDBLOCK, EINPROGRESS, EALREADY)) or (result == EINVAL and is_windows): elif (result in (EWOULDBLOCK, EINPROGRESS, EALREADY)) or (result == EINVAL and is_windows):
timeleft = end - time.time() timeleft = end - time.time()
if timeleft <= 0: if timeleft <= 0:
raise timeout raise timeout('timed out')
wait_readwrite(sock.fileno(), timeout=timeleft) wait_readwrite(sock.fileno(), timeout=timeleft)
else: else:
raise error(result, strerror(result)) raise error(result, strerror(result))
...@@ -396,7 +396,7 @@ class socket(object): ...@@ -396,7 +396,7 @@ class socket(object):
break break
timeleft = end - time.time() timeleft = end - time.time()
if timeleft <= 0: if timeleft <= 0:
raise timeout raise timeout('timed out')
def sendto(self, *args): def sendto(self, *args):
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment