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.

Sign up for GitHub

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

Jump to bottom

Fix urllib3 Recursion Regression #410

Merged
merged 4 commits into from Oct 15, 2021
Merged

Fix urllib3 Recursion Regression #410

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a179df
Fix urllib3 recursion
TimPansino Oct 14, 2021
04bd013
Add regression testing for gevent
TimPansino Oct 14, 2021
839e216
[Mega-Linter] Apply linters fixes
TimPansino Oct 14, 2021
ce71233
Add urllib3 to gevent tox env
TimPansino Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion newrelic/packages/urllib3/contrib/_securetransport/bindings.py
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@
)
from ctypes.util import find_library

from urllib3.packages.six import raise_from
from ...packages.six import raise_from

if platform.system() != "Darwin":
raise ImportError("Only macOS is supported")
Expand Down
4 changes: 2 additions & 2 deletions newrelic/packages/urllib3/util/ssltransport.py
View file
Open in desktop
Expand Up @@ -2,8 +2,8 @@
import socket
import ssl

from urllib3.exceptions import ProxySchemeUnsupported
from urllib3.packages import six
from ..exceptions import ProxySchemeUnsupported
from ..packages import six

SSL_BLOCKSIZE = 16384

Expand Down
18 changes: 16 additions & 2 deletions tests/adapter_gevent/test_patch_thread.py → tests/adapter_gevent/test_patching.py
View file
Open in desktop
Expand Up @@ -12,8 +12,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import gevent.monkey


def test_patch_thread():
import gevent.monkey

gevent.monkey.patch_thread()


def test_patch_ssl_recursion():
import gevent.monkey

gevent.monkey.patch_all()

# Delay imports and test creation of contexts from both bundled and installed urllib3
import urllib3.util.ssl_

import newrelic.packages.urllib3.util.ssl_

context1 = urllib3.util.ssl_.create_urllib3_context()
context2 = newrelic.packages.urllib3.util.ssl_.create_urllib3_context()