Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gevent
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gevent
Commits
73d817dc
Commit
73d817dc
authored
Aug 12, 2015
by
Jason Madden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
socket.sendto needs to use self.timeout or it gets the global timeout exception. Fixes #634.
parent
96a641f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
changelog.rst
changelog.rst
+8
-0
gevent/_socket2.py
gevent/_socket2.py
+1
-1
gevent/_socket3.py
gevent/_socket3.py
+1
-1
No files found.
changelog.rst
View file @
73d817dc
...
...
@@ -22,6 +22,14 @@ Unreleased
~630MB/s). See this `pypy bug`_ for details.
- Fix a possible ``TypeError`` when calling ``gevent.socket.wait``.
Reported in #635 by lanstin.
- ``gevent.socket.socket:sendto`` properly respects the socket's
blocking status (meaning in can raise EWOULDBLOCK now in cases it
wouldn't have before). Reported in :pr:`634` by Mike Kaplinskiy.
- Common lookup errors using the :mod:`threaded resolver
<gevent.resolver_thread>` are no longer always printed to stderr
since they are usually out of the programmer's control and caught
explicitly. (Programming errors like ``TypeError`` are still
printed.) Reported in :issue:`617` by Jay Oster and Carlos Sanchez.
.. _future: http://python-future.org
.. _bench_sendall.py: https://raw.githubusercontent.com/gevent/gevent/master/greentest/bench_sendall.py
...
...
gevent/_socket2.py
View file @
73d817dc
...
...
@@ -381,7 +381,7 @@ class socket(object):
try
:
return
sock
.
sendto
(
*
args
)
except
error
as
ex
:
if
ex
.
args
[
0
]
!=
EWOULDBLOCK
or
timeout
==
0.0
:
if
ex
.
args
[
0
]
!=
EWOULDBLOCK
or
self
.
timeout
==
0.0
:
raise
sys
.
exc_clear
()
self
.
_wait
(
self
.
_write_event
)
...
...
gevent/_socket3.py
View file @
73d817dc
...
...
@@ -349,7 +349,7 @@ class socket(object):
try
:
return
_socket
.
socket
.
sendto
(
self
.
_sock
,
*
args
)
except
error
as
ex
:
if
ex
.
args
[
0
]
!=
EWOULDBLOCK
or
timeout
==
0.0
:
if
ex
.
args
[
0
]
!=
EWOULDBLOCK
or
self
.
timeout
==
0.0
:
raise
self
.
_wait
(
self
.
_write_event
)
try
:
...
...
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