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.
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
Fix GreenSocket conflict with pysocks #680
base: master
Are you sure you want to change the base?
Conversation
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #680 +/- ##
======================================
- Coverage 44% 44% -1%
======================================
Files 87 87
Lines 11917 11914 -3
Branches 1780 1781 +1
======================================
- Hits 5290 5284 -6
- Misses 6224 6226 +2
- Partials 403 404 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
@@ -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): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
Also needs a test. |
#616
Anorov/PySocks#121