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
07891830
Commit
07891830
authored
Nov 18, 2019
by
Jason Madden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More Python 3.8 fixes, and another attempt at the PyPy fix.
parent
2ef0a109
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
243 additions
and
214 deletions
+243
-214
scripts/install.sh
scripts/install.sh
+2
-2
src/gevent/_ssl3.py
src/gevent/_ssl3.py
+1
-1
src/gevent/subprocess.py
src/gevent/subprocess.py
+6
-1
src/gevent/tests/test__makefile_ref.py
src/gevent/tests/test__makefile_ref.py
+223
-210
src/gevent/tests/test__monkey_sigchld_2.py
src/gevent/tests/test__monkey_sigchld_2.py
+5
-0
src/gevent/tests/test__monkey_sigchld_3.py
src/gevent/tests/test__monkey_sigchld_3.py
+6
-0
No files found.
scripts/install.sh
View file @
07891830
...
...
@@ -29,8 +29,8 @@ else
# and it's pretty large.
# So if we need to incorporate changes from pyenv, either temporarily
# turn this back on, or remove the Travis caches.
git fetch
||
echo
"Fetch failed to complete. Ignoring"
git reset
--hard
origin/master
#
git fetch || echo "Fetch failed to complete. Ignoring"
#
git reset --hard origin/master
cd
$back
fi
...
...
src/gevent/_ssl3.py
View file @
07891830
...
...
@@ -162,7 +162,7 @@ class SSLContext(orig_SSLContext):
super
(
orig_SSLContext
,
orig_SSLContext
).
sni_callback
.
__set__
(
self
,
value
)
else
:
# In newer versions, this just sets sni_callback.
def
set_servername_callback
(
self
,
cb
):
def
set_servername_callback
(
self
,
cb
):
# pylint:disable=arguments-differ
if
cb
and
callable
(
cb
):
cb
=
_Callback
(
cb
)
super
().
set_servername_callback
(
cb
)
...
...
src/gevent/subprocess.py
View file @
07891830
...
...
@@ -1007,10 +1007,15 @@ class Popen(object):
# Process startup details
if
startupinfo
is
None
:
startupinfo
=
STARTUPINFO
()
elif
hasattr
(
startupinfo
,
'
_
copy'
):
elif
hasattr
(
startupinfo
,
'copy'
):
# bpo-34044: Copy STARTUPINFO since it is modified below,
# so the caller can reuse it multiple times.
startupinfo
=
startupinfo
.
copy
()
elif
hasattr
(
startupinfo
,
'_copy'
):
# When the fix was backported to Python 3.7, copy() was
# made private as _copy.
startupinfo
=
startupinfo
.
_copy
()
use_std_handles
=
-
1
not
in
(
p2cread
,
c2pwrite
,
errwrite
)
if
use_std_handles
:
startupinfo
.
dwFlags
|=
STARTF_USESTDHANDLES
...
...
src/gevent/tests/test__makefile_ref.py
View file @
07891830
This diff is collapsed.
Click to expand it.
src/gevent/tests/test__monkey_sigchld_2.py
View file @
07891830
...
...
@@ -16,6 +16,11 @@ def handle(*_args):
os
.
waitpid
(
-
1
,
os
.
WNOHANG
)
# The signal watcher must be installed *before* monkey patching
if
hasattr
(
signal
,
'SIGCHLD'
):
if
sys
.
version_info
[:
2
]
>=
(
3
,
8
)
and
os
.
environ
.
get
(
"PYTHONDEVMODE"
):
# See test__monkey_sigchld.py
print
(
"Ran 1 tests in 0.0s (skipped=1)"
)
sys
.
exit
(
0
)
# On Python 2, the signal handler breaks the platform
# module, because it uses os.popen. pkg_resources uses the platform
# module.
...
...
src/gevent/tests/test__monkey_sigchld_3.py
View file @
07891830
...
...
@@ -25,6 +25,11 @@ def _waitpid(p):
assert
stat
==
0
,
stat
if
hasattr
(
signal
,
'SIGCHLD'
):
if
sys
.
version_info
[:
2
]
>=
(
3
,
8
)
and
os
.
environ
.
get
(
"PYTHONDEVMODE"
):
# See test__monkey_sigchld.py
print
(
"Ran 1 tests in 0.0s (skipped=1)"
)
sys
.
exit
(
0
)
# Do what subprocess does and make sure we have the watcher
# in the parent
get_hub
().
loop
.
install_sigchld
()
...
...
@@ -50,3 +55,4 @@ if hasattr(signal, 'SIGCHLD'):
sys
.
exit
(
0
)
else
:
print
(
"No SIGCHLD, not testing"
)
print
(
"Ran 1 tests in 0.0s (skipped=1)"
)
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