Kaydet (Commit) a8b5f7d1 authored tarafından Jeremy Hylton's avatar Jeremy Hylton

Remove hard-coded NT constants that are already defined in errno on NT.

Wrap some long lines.
Remove unnecessary tuple unpack.
üst 024ef6f4
...@@ -53,15 +53,8 @@ import sys ...@@ -53,15 +53,8 @@ import sys
import types import types
import os import os
if os.name == 'nt': from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
EWOULDBLOCK = 10035 ENOTCONN, ESHUTDOWN
EINPROGRESS = 10036
EALREADY = 10037
ECONNRESET = 10054
ENOTCONN = 10057
ESHUTDOWN = 10058
else:
from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, ENOTCONN, ESHUTDOWN
try: try:
socket_map socket_map
...@@ -264,7 +257,8 @@ class dispatcher: ...@@ -264,7 +257,8 @@ class dispatcher:
try: try:
self.socket.setsockopt ( self.socket.setsockopt (
socket.SOL_SOCKET, socket.SO_REUSEADDR, socket.SOL_SOCKET, socket.SO_REUSEADDR,
self.socket.getsockopt (socket.SOL_SOCKET, socket.SO_REUSEADDR) | 1 self.socket.getsockopt (socket.SOL_SOCKET,
socket.SO_REUSEADDR) | 1
) )
except socket.error: except socket.error:
pass pass
...@@ -398,7 +392,7 @@ class dispatcher: ...@@ -398,7 +392,7 @@ class dispatcher:
self.handle_expt() self.handle_expt()
def handle_error (self): def handle_error (self):
(file,fun,line), t, v, tbinfo = compact_traceback() nil, t, v, tbinfo = compact_traceback()
# sometimes a user repr method will crash. # sometimes a user repr method will crash.
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