Commit 174bdbc9 authored by Andrew M. Kuchling's avatar Andrew M. Kuchling

[Part of patch #909005] Repeating exception changed from 'raise socket.error,...

[Part of patch #909005] Repeating exception changed from 'raise socket.error, why' to just raise.  Make use of connect_ex() raise socket.error with 2-tuple instead of just error code
parent 419af88b
......@@ -54,7 +54,7 @@ import time
import os
from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
ENOTCONN, ESHUTDOWN, EINTR, EISCONN
ENOTCONN, ESHUTDOWN, EINTR, EISCONN, errorcode
try:
socket_map
......@@ -287,7 +287,7 @@ class dispatcher:
self.connected = True
self.handle_connect()
else:
raise socket.error, err
raise socket.error, (err, errorcode[err])
def accept(self):
# XXX can return either an address pair or None
......@@ -298,7 +298,7 @@ class dispatcher:
if why[0] == EWOULDBLOCK:
pass
else:
raise socket.error, why
raise
def send(self, data):
try:
......@@ -308,7 +308,7 @@ class dispatcher:
if why[0] == EWOULDBLOCK:
return 0
else:
raise socket.error, why
raise
return 0
def recv(self, buffer_size):
......@@ -327,7 +327,7 @@ class dispatcher:
self.handle_close()
return ''
else:
raise socket.error, why
raise
def close(self):
self.del_channel()
......
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