Remove Python 2 support from SecureTransport makefile function
MODIFY
src/urllib3/contrib/securetransport.py
src/urllib3/contrib/securetransport.py
@@ -66,6 +66,7 @@ import weakref
import six
from .. import util
+from ..packages.backports.makefile import backport_makefile
from ._securetransport.bindings import CoreFoundation, Security, SecurityConst
from ._securetransport.low_level import (
_assert_no_error,
@@ -76,12 +77,6 @@ from ._securetransport.low_level import (
_temporary_keychain,
)
-try: # Platform-specific: Python 2
- from socket import _fileobject
-except ImportError: # Platform-specific: Python 3
- _fileobject = None
- from ..packages.backports.makefile import backport_makefile
-
__all__ = ["inject_into_urllib3", "extract_from_urllib3"]
# SNI always works
@@ -761,15 +756,6 @@ class WrappedSocket:
self._makefile_refs -= 1
-if _fileobject: # Platform-specific: Python 2
-
- def makefile(self, mode, bufsize=-1):
- self._makefile_refs += 1
- return _fileobject(self, mode, bufsize, close=True)
-
-
-else: # Platform-specific: Python 3
-
def makefile(self, mode="r", buffering=None, *args, **kwargs):
# We disable buffering with SecureTransport because it conflicts with
# the buffering that ST does internally (see issue #1153 for more).

Remove Python 2 support from SecureTransport makefile function (#2063)