Fix GreenSocket conflict with pysocks

Anorov/PySocks#121
eventlet · Dec 24, 2020 · c178025 · c178025
1 parent 4705f07
commit c178025
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/eventlet/greenio/base.py b/eventlet/greenio/base.py
@@ -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):
+                self.setblocking(True)
             return
         try:
             f = howlong.__float__