Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix GreenSocket conflict with pysocks #680

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix GreenSocket conflict with pysocks #680

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion eventlet/greenio/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,8 @@ def setblocking(self, flag):

def settimeout(self, howlong):
if howlong is None or howlong == _GLOBAL_DEFAULT_TIMEOUT:
self.setblocking(True)
if not (self.act_non_blocking == False and self._timeout is None):
Copy link
Member

@temoto temoto Dec 24, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if not (self.act_non_blocking == False and self._timeout is None):
if self.act_non_blocking or self._timeout is not None:

or at least x == False -> not x

self.setblocking(True)
return
try:
f = howlong.__float__
Expand Down