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
448ca394
Commit
448ca394
authored
Jan 04, 2017
by
Jason Madden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for socketpair on 3.6 and earlier.
parent
01b376a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
7 deletions
+15
-7
appveyor.yml
appveyor.yml
+6
-6
src/gevent/_socket3.py
src/gevent/_socket3.py
+9
-1
No files found.
appveyor.yml
View file @
448ca394
...
...
@@ -17,8 +17,8 @@ environment:
# PYTHON_VERSION: "2.7.x"
# PYTHON_ARCH: "32"
-
PYTHON
:
"
C:
\\
Python3
4
-x64"
PYTHON_VERSION
:
"
3.
4.x"
# currently 3.4.4
-
PYTHON
:
"
C:
\\
Python3
6
-x64"
PYTHON_VERSION
:
"
3.
6.x"
# currently 3.6.0
PYTHON_ARCH
:
"
64"
PYTHON_EXE
:
python
...
...
@@ -27,13 +27,13 @@ environment:
PYTHON_ARCH
:
"
64"
PYTHON_EXE
:
python
-
PYTHON
:
"
C:
\\
Python3
5
-x64"
PYTHON_VERSION
:
"
3.
5.x"
# currently 3.5.2
-
PYTHON
:
"
C:
\\
Python3
4
-x64"
PYTHON_VERSION
:
"
3.
4.x"
# currently 3.4.4
PYTHON_ARCH
:
"
64"
PYTHON_EXE
:
python
-
PYTHON
:
"
C:
\\
Python3
6
-x64"
PYTHON_VERSION
:
"
3.
6.x"
# currently 3.6.0
-
PYTHON
:
"
C:
\\
Python3
5
-x64"
PYTHON_VERSION
:
"
3.
5.x"
# currently 3.5.2
PYTHON_ARCH
:
"
64"
PYTHON_EXE
:
python
...
...
src/gevent/_socket3.py
View file @
448ca394
...
...
@@ -654,9 +654,17 @@ if hasattr(_socket, "socketpair"):
a
=
socket
(
family
,
type
,
proto
,
a
.
detach
())
b
=
socket
(
family
,
type
,
proto
,
b
.
detach
())
return
a
,
b
elif
sys
.
version_info
[:
2
]
>=
(
3
,
6
):
# Origin: https://gist.github.com/4325783, by Geert Jansen. Public domain.
# gevent: taken from 3.6 release. Expected to be used only on Win/3.6
# gevent: for testing on < 3.5, pass the default value of 128 to lsock.listen()
# (3.5+ uses this as a default and the original code passed no value)
# gevent: TODO: Expose this for all versions?
_LOCALHOST
=
'127.0.0.1'
_LOCALHOST_V6
=
'::1'
def
socketpair
(
family
=
AF_INET
,
type
=
SOCK_STREAM
,
proto
=
0
):
if
family
==
AF_INET
:
host
=
_LOCALHOST
...
...
@@ -675,7 +683,7 @@ elif sys.version_info[:2] >= (3, 6):
lsock
=
socket
(
family
,
type
,
proto
)
try
:
lsock
.
bind
((
host
,
0
))
lsock
.
listen
()
lsock
.
listen
(
128
)
# On IPv6, ignore flow_info and scope_id
addr
,
port
=
lsock
.
getsockname
()[:
2
]
csock
=
socket
(
family
,
type
,
proto
)
...
...
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