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
60f9ce11
Commit
60f9ce11
authored
Oct 10, 2016
by
Jason Madden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for test_ssl on old 2.7
parent
4179f785
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
src/gevent/_sslgte279.py
src/gevent/_sslgte279.py
+3
-0
src/greentest/patched_tests_setup.py
src/greentest/patched_tests_setup.py
+7
-0
No files found.
src/gevent/_sslgte279.py
View file @
60f9ce11
...
@@ -306,6 +306,9 @@ class SSLSocket(socket):
...
@@ -306,6 +306,9 @@ class SSLSocket(socket):
raise
ValueError
(
"Read on closed or unwrapped SSL socket."
)
raise
ValueError
(
"Read on closed or unwrapped SSL socket."
)
if
len
==
0
:
if
len
==
0
:
return
b''
if
buffer
is
None
else
0
return
b''
if
buffer
is
None
else
0
if
len
<
0
:
# This is handled natively in python 2.7.12+
raise
ValueError
(
"Negative read length"
)
try
:
try
:
if
buffer
is
not
None
:
if
buffer
is
not
None
:
return
self
.
_sslobj
.
read
(
len
,
buffer
)
return
self
.
_sslobj
.
read
(
len
,
buffer
)
...
...
src/greentest/patched_tests_setup.py
View file @
60f9ce11
...
@@ -262,6 +262,13 @@ if sys.version_info[:3] <= (2, 7, 8):
...
@@ -262,6 +262,13 @@ if sys.version_info[:3] <= (2, 7, 8):
'test_httpservers.SimpleHTTPServerTestCase.test_get'
'test_httpservers.SimpleHTTPServerTestCase.test_get'
]
]
if
sys
.
version_info
[:
3
]
<=
(
2
,
7
,
11
):
disabled_tests
+=
[
# These were added/fixed in 2.7.12+
'test_ssl.ThreadedTests.test__https_verify_certificates'
,
'test_ssl.ThreadedTests.test__https_verify_envvar'
,
]
if
sys
.
platform
==
'darwin'
:
if
sys
.
platform
==
'darwin'
:
disabled_tests
+=
[
disabled_tests
+=
[
...
...
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