Complete backwards compatibility:

* Add TLS_MODE to old connect() calls
* Provide ip to connect when in HTTP mode

Author: tannewt

adafruit_requests.py

@@ -100,7 +100,7 @@ def __init__(self, sock, session=None):
         http = self._readto(b" ")
         if not http:
             raise RuntimeError("Unable to read HTTP response.")
-        self.status_code = int(self._readto(b" "))
+        self.status_code = int(bytes(self._readto(b" ")))
         self.reason = self._readto(b"\r\n")
         self._parse_headers()
         self._raw = None
@@ -196,7 +196,7 @@ def _readinto(self, buf):
                 if self._remaining == 0:
                     self._throw_away(2)
                 chunk_header = self._readto(b";", b"\r\n")
-                http_chunk_size = int(chunk_header, 16)
+                http_chunk_size = int(bytes(chunk_header), 16)
                 if http_chunk_size == 0:
                     self._chunked = False
                     self._parse_headers()
@@ -237,7 +237,7 @@ def close(self):
             elif self._chunked:
                 while True:
                     chunk_header = self._readto(b";", b"\r\n")
-                    chunk_size = int(chunk_header, 16)
+                    chunk_size = int(bytes(chunk_header), 16)
                     if chunk_size == 0:
                         break
                     self._throw_away(chunk_size + 2)
@@ -391,12 +391,14 @@ def _get_socket(self, host, port, proto, *, timeout=1):
             host, port, 0, self._socket_pool.SOCK_STREAM
         )[0]
         sock = self._socket_pool.socket(addr_info[0], addr_info[1], addr_info[2])
+        connect_host = addr_info[-1][0]
         if proto == "https:":
             sock = self._ssl_context.wrap_socket(sock, server_hostname=host)
+            connect_host = host
         sock.settimeout(timeout)  # socket read timeout
         ok = True
         try:
-            sock.connect((host, port))
+            sock.connect((connect_host, port))
         except MemoryError:
             if not any(self._socket_free.items()):
                 raise
@@ -411,7 +413,7 @@ def _get_socket(self, host, port, proto, *, timeout=1):
             if proto == "https:":
                 sock = self._ssl_context.wrap_socket(sock, server_hostname=host)
             sock.settimeout(timeout)  # socket read timeout
-            sock.connect((host, port))
+            sock.connect((connect_host, port))
         self._open_sockets[key] = sock
         self._socket_free[sock] = False
         return sock
@@ -490,7 +492,7 @@ def request(
                 socket.send(bytes(data, "utf-8"))
 
         resp = Response(socket, self)  # our response
-        if "location" in resp.headers and not 200 <= resp.status_code <= 299:
+        if "location" in resp.headers and 300 <= resp.status_code <= 399:
             raise NotImplementedError("Redirects not yet supported")
 
         self._last_response = resp
@@ -525,19 +527,31 @@ def delete(self, url, **kw):
 
 _default_session = None  # pylint: disable=invalid-name
 
+class _FakeSSLSocket:
+    def __init__(self, socket, tls_mode):
+        self._socket = socket
+        self._mode = tls_mode
+        self.settimeout = socket.settimeout
+        self.send = socket.send
+        self.recv = socket.recv
+
+    def connect(self, address):
+        return self._socket.connect(address, self._mode)
 
 class _FakeSSLContext:
-    @staticmethod
-    def wrap_socket(socket, server_hostname=None):
+    def __init__(self, iface):
+        self._iface = iface
+
+    def wrap_socket(self, socket, server_hostname=None):
         """Return the same socket"""
         # pylint: disable=unused-argument
-        return socket
+        return _FakeSSLSocket(socket, self._iface.TLS_MODE)
 
 
 def set_socket(sock, iface=None):
     """Legacy API for setting the socket and network interface. Use a `Session` instead."""
     global _default_session  # pylint: disable=global-statement,invalid-name
-    _default_session = Session(sock, _FakeSSLContext())
+    _default_session = Session(sock, _FakeSSLContext(iface))
     if iface:
         sock.set_interface(iface)
 

tests/chunk_test.py

@@ -38,7 +38,7 @@ def test_get_text():
     s = adafruit_requests.Session(pool)
     r = s.get("http://" + host + path)
 
-    sock.connect.assert_called_once_with((host, 80))
+    sock.connect.assert_called_once_with((ip, 80))
     sock.send.assert_has_calls(
         [
             mock.call(b"GET /testwifi/index.html HTTP/1.1\r\n"),

tests/header_test.py

@@ -20,7 +20,7 @@ def test_json():
     headers = {"user-agent": "blinka/1.0.0"}
     r = s.get("http://" + host + "/get", headers=headers)
 
-    sock.connect.assert_called_once_with((host, 80))
+    sock.connect.assert_called_once_with((ip, 80))
     sent = b"".join(sent).lower()
     assert b"user-agent: blinka/1.0.0\r\n" in sent
     # The current implementation sends two user agents. Fix it, and uncomment below.

tests/legacy_test.py

@@ -20,10 +20,21 @@ def test_get_json():
     adafruit_requests.set_socket(mocket, mocket.interface)
     r = adafruit_requests.get("http://" + host + "/get")
 
-    sock.connect.assert_called_once_with((host, 80))
+    sock.connect.assert_called_once_with((ip, 80))
     assert r.json() == response
     r.close()
 
+def test_tls_mode():
+    mocket.getaddrinfo.return_value = ((None, None, None, None, (ip, 80)),)
+    sock = mocket.Mocket(headers + encoded)
+    mocket.socket.return_value = sock
+
+    adafruit_requests.set_socket(mocket, mocket.interface)
+    r = adafruit_requests.get("https://" + host + "/get")
+
+    sock.connect.assert_called_once_with((host, 443), mocket.interface.TLS_MODE)
+    assert r.json() == response
+    r.close()
 
 def test_post_string():
     mocket.getaddrinfo.return_value = ((None, None, None, None, (ip, 80)),)
@@ -33,6 +44,6 @@ def test_post_string():
     adafruit_requests.set_socket(mocket, mocket.interface)
     data = "31F"
     r = adafruit_requests.post("http://" + host + "/post", data=data)
-    sock.connect.assert_called_once_with((host, 80))
+    sock.connect.assert_called_once_with((ip, 80))
     sock.send.assert_called_with(b"31F")
     r.close()

tests/parse_test.py

@@ -24,5 +24,5 @@ def test_json():
 
     s = adafruit_requests.Session(pool)
     r = s.get("http://" + host + "/get")
-    sock.connect.assert_called_once_with((host, 80))
+    sock.connect.assert_called_once_with((ip, 80))
     assert r.json() == response

tests/post_test.py

@@ -20,7 +20,7 @@ def test_method():
 
     s = adafruit_requests.Session(pool)
     r = s.post("http://" + host + "/post")
-    sock.connect.assert_called_once_with((host, 80))
+    sock.connect.assert_called_once_with((ip, 80))
     sock.send.assert_has_calls(
         [mock.call(b"POST /post HTTP/1.1\r\n"), mock.call(b"Host: httpbin.org\r\n")]
     )
@@ -35,7 +35,7 @@ def test_string():
     s = adafruit_requests.Session(pool)
     data = "31F"
     r = s.post("http://" + host + "/post", data=data)
-    sock.connect.assert_called_once_with((host, 80))
+    sock.connect.assert_called_once_with((ip, 80))
     sock.send.assert_called_with(b"31F")
 
 
@@ -48,7 +48,7 @@ def test_form():
     s = adafruit_requests.Session(pool)
     data = {"Date": "July 25, 2019"}
     r = s.post("http://" + host + "/post", data=data)
-    sock.connect.assert_called_once_with((host, 80))
+    sock.connect.assert_called_once_with((ip, 80))
     sock.send.assert_called_with(b"Date=July 25, 2019")
 
 
@@ -61,5 +61,5 @@ def test_json():
     s = adafruit_requests.Session(pool)
     json_data = {"Date": "July 25, 2019"}
     r = s.post("http://" + host + "/post", json=json_data)
-    sock.connect.assert_called_once_with((host, 80))
+    sock.connect.assert_called_once_with((ip, 80))
     sock.send.assert_called_with(b'{"Date": "July 25, 2019"}')

tests/protocol_test.py

@@ -53,7 +53,7 @@ def test_get_http_text():
     s = adafruit_requests.Session(pool)
     r = s.get("http://" + host + path)
 
-    sock.connect.assert_called_once_with((host, 80))
+    sock.connect.assert_called_once_with((ip, 80))
     sock.send.assert_has_calls(
         [
             mock.call(b"GET /testwifi/index.html HTTP/1.1\r\n"),