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.

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

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

Conversation

terryzhu
Copy link

@codecov
Copy link

codecov bot commented Dec 24, 2020

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (4705f07) 44% compared to head (319a384) 44%.
Report is 67 commits behind head on master.

❗ Current head 319a384 differs from pull request most recent head c178025. Consider uploading reports for the commit c178025 to get more accurate results

Files Patch % Lines
eventlet/greenio/base.py 0% 1 Missing and 1 partial ⚠️
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     
Flag Coverage Δ
ipv6 16% <0%> (-1%) ⬇️
py27epolls 56% <0%> (-1%) ⬇️
py27poll 56% <0%> (-1%) ⬇️
py27selects 55% <0%> (-1%) ⬇️
py35epolls 49% <0%> (-1%) ⬇️
py35poll 49% <0%> (-1%) ⬇️
py35selects 49% <0%> (-1%) ⬇️
py36epolls 49% <0%> (-1%) ⬇️
py36poll 49% <0%> (-1%) ⬇️
py36selects 49% <0%> (-1%) ⬇️
py37epolls 49% <0%> (-1%) ⬇️
py37poll 49% <0%> (-1%) ⬇️
py37selects 49% <0%> (-1%) ⬇️
py38epolls 40% <0%> (-1%) ⬇️
py38openssl 39% <0%> (-1%) ⬇️
py38poll 40% <0%> (-1%) ⬇️
py38selects 40% <0%> (-1%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -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

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

@temoto
Copy link
Member

temoto commented Dec 24, 2020

Also needs a test.

@itamarst itamarst added the bug label Dec 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants