@@ -11,42 +11,42 @@ def __init__(self):
11
11
self .poller = select .poll ()
12
12
self .objmap = {}
13
13
14
- def add_reader (self , fd , cb , * args ):
14
+ def add_reader (self , sock , cb , * args ):
15
15
if DEBUG and __debug__ :
16
- log .debug ("add_reader%s" , (fd , cb , args ))
16
+ log .debug ("add_reader%s" , (sock , cb , args ))
17
17
if args :
18
- self .poller .register (fd , select .POLLIN )
19
- self .objmap [fd ] = (cb , args )
18
+ self .poller .register (sock , select .POLLIN )
19
+ self .objmap [id ( sock ) ] = (cb , args )
20
20
else :
21
- self .poller .register (fd , select .POLLIN )
22
- self .objmap [fd ] = cb
21
+ self .poller .register (sock , select .POLLIN )
22
+ self .objmap [id ( sock ) ] = cb
23
23
24
- def remove_reader (self , fd ):
24
+ def remove_reader (self , sock ):
25
25
if DEBUG and __debug__ :
26
- log .debug ("remove_reader(%s)" , fd )
27
- self .poller .unregister (fd )
28
- del self .objmap [fd ]
26
+ log .debug ("remove_reader(%s)" , sock )
27
+ self .poller .unregister (sock )
28
+ del self .objmap [id ( sock ) ]
29
29
30
- def add_writer (self , fd , cb , * args ):
30
+ def add_writer (self , sock , cb , * args ):
31
31
if DEBUG and __debug__ :
32
- log .debug ("add_writer%s" , (fd , cb , args ))
32
+ log .debug ("add_writer%s" , (sock , cb , args ))
33
33
if args :
34
- self .poller .register (fd , select .POLLOUT )
35
- self .objmap [fd ] = (cb , args )
34
+ self .poller .register (sock , select .POLLOUT )
35
+ self .objmap [id ( sock ) ] = (cb , args )
36
36
else :
37
- self .poller .register (fd , select .POLLOUT )
38
- self .objmap [fd ] = cb
37
+ self .poller .register (sock , select .POLLOUT )
38
+ self .objmap [id ( sock ) ] = cb
39
39
40
- def remove_writer (self , fd ):
40
+ def remove_writer (self , sock ):
41
41
if DEBUG and __debug__ :
42
- log .debug ("remove_writer(%s)" , fd )
42
+ log .debug ("remove_writer(%s)" , sock )
43
43
try :
44
- self .poller .unregister (fd )
45
- self .objmap .pop (fd , None )
44
+ self .poller .unregister (sock )
45
+ self .objmap .pop (id ( sock ) , None )
46
46
except OSError as e :
47
- # StreamWriter.awrite() first tries to write to an fd ,
47
+ # StreamWriter.awrite() first tries to write to a socket ,
48
48
# and if that succeeds, yield IOWrite may never be called
49
- # for that fd , and it will never be added to poller. So,
49
+ # for that socket , and it will never be added to poller. So,
50
50
# ignore such error.
51
51
if e .args [0 ] != errno .ENOENT :
52
52
raise
@@ -63,8 +63,8 @@ def wait(self, delay):
63
63
# Remove "if res" workaround after
64
64
# https://github.com/micropython/micropython/issues/2716 fixed.
65
65
if res :
66
- for fd , ev in res :
67
- cb = self .objmap [fd ]
66
+ for sock , ev in res :
67
+ cb = self .objmap [id ( sock ) ]
68
68
if DEBUG and __debug__ :
69
69
log .debug ("Calling IO callback: %r" , cb )
70
70
if isinstance (cb , tuple ):
0 commit comments