Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
c0aa9eeb
Commit
c0aa9eeb
authored
Apr 09, 2012
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the patch for issue #7978: select() raises select.error before 3.3, not OSError.
parent
f18d6f3f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Lib/socketserver.py
Lib/socketserver.py
+2
-2
Lib/test/test_socketserver.py
Lib/test/test_socketserver.py
+1
-1
No files found.
Lib/socketserver.py
View file @
c0aa9eeb
...
...
@@ -153,8 +153,8 @@ def _eintr_retry(func, *args):
while
True
:
try
:
return
func
(
*
args
)
except
OSError
as
e
:
if
e
.
errno
!=
errno
.
EINTR
:
except
(
OSError
,
select
.
error
)
as
e
:
if
e
.
args
[
0
]
!=
errno
.
EINTR
:
raise
class
BaseServer
:
...
...
Lib/test/test_socketserver.py
View file @
c0aa9eeb
...
...
@@ -244,7 +244,7 @@ class SocketServerTest(unittest.TestCase):
self
.
called
+=
1
if
self
.
called
==
1
:
# raise the exception on first call
raise
OSE
rror
(
errno
.
EINTR
,
os
.
strerror
(
errno
.
EINTR
))
raise
select
.
e
rror
(
errno
.
EINTR
,
os
.
strerror
(
errno
.
EINTR
))
else
:
# Return real select value for consecutive calls
return
old_select
(
*
args
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment