Supporting Python 3.7 (#97)

* Trying to make Python 3.7 happy. Enabling it on Travis.
* Removing generated files for Shippable.
* All tests are passing with Python 3.7!
* Mocket now supports Python 3.7 [skip ci].

Author: mindflayer

.travis.yml

@@ -1,3 +1,4 @@
+dist: xenial
 services:
   - redis-server
 language: python
@@ -6,9 +7,9 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-#  - "3.7-dev"  # need to investigate the failure
+  - "3.7"
   - "pypy"
-#  - "pypy3"
+  - "pypy3"
 install:
   - make develop
 script:

Makefile

@@ -38,7 +38,7 @@ publish:
 	anaconda upload dist/mocket-$(shell python -c 'import mocket; print(mocket.__version__)').tar.gz
 
 clean:
-	rm -rf dist
+	rm -rf dist shippable
 	rm -rf *.egg-info
 	find . -type d -name __pycache__ -exec rm -rf {} \;
 

README.rst

@@ -20,6 +20,10 @@ A socket mock framework
 -------------------------
     for all kinds of socket *animals*, web-clients included - with gevent/asyncio/SSL support
 
+Versioning
+==========
+Starting from 3.7.0, Mocket major version will follow the same numbering pattern as Python's and therefore indicate the most recent Python version that is supported.
+
 Support it
 ==========
 *Star* the project on GitHub, Buy Me a Coffee or, even better, contribute with patches or documentation.

mocket/__init__.py

@@ -7,4 +7,4 @@
 
 __all__ = (mocketize, Mocket, MocketEntry, Mocketizer)
 
-__version__ = '2.7.4'
+__version__ = "3.7.0"

mocket/mocket.py

@@ -12,6 +12,9 @@
 
 import decorator
 import hexdump
+import urllib3
+from urllib3.util.ssl_ import ssl_wrap_socket as urllib3_ssl_wrap_socket
+from urllib3.util.ssl_ import wrap_socket as urllib3_wrap_socket
 
 from .compat import (
     FileNotFoundError,
@@ -22,7 +25,7 @@
     encode_to_bytes,
     text_type,
 )
-from .utils import MocketSocketCore, wrap_ssl_socket, SSL_PROTOCOL
+from .utils import SSL_PROTOCOL, MocketSocketCore, wrap_ssl_socket
 
 xxh32 = None
 try:
@@ -41,6 +44,7 @@
 except ImportError:
     pyopenssl_override = False
 
+
 true_socket = socket.socket
 true_create_connection = socket.create_connection
 true_gethostbyname = socket.gethostbyname
@@ -50,6 +54,8 @@
 true_ssl_socket = ssl.SSLSocket
 true_ssl_context = ssl.SSLContext
 true_inet_pton = socket.inet_pton
+true_urllib3_wrap_socket = urllib3_wrap_socket
+true_urllib3_ssl_wrap_socket = urllib3_ssl_wrap_socket
 
 
 class SuperFakeSSLContext(object):
@@ -87,6 +93,8 @@ def load_default_certs(*args, **kwargs):
 
     @staticmethod
     def wrap_socket(sock=sock, *args, **kwargs):
+        sock.kwargs = kwargs
+        sock._secure_socket = True
         return sock
 
     def wrap_bio(self, incoming, outcoming, *args, **kwargs):
@@ -126,6 +134,7 @@ class MocketSocket(object):
     compression = lambda s: ssl.OP_NO_COMPRESSION
     _mode = None
     _bufsize = None
+    _secure_socket = False
 
     def __init__(
         self, family=socket.AF_INET, type=socket.SOCK_STREAM, proto=0, *args, **kwargs
@@ -139,6 +148,7 @@ def __init__(
         self.type = int(type)
         self.proto = int(proto)
         self._truesocket_recording_dir = None
+        self.kwargs = kwargs
 
         sock = kwargs.get("sock")
         if sock is not None:
@@ -175,6 +185,9 @@ def settimeout(self, timeout):
         except AttributeError:
             pass
 
+    def getsockopt(self, level, optname, buflen=None):
+        return socket.SOCK_STREAM
+
     def do_handshake(self):
         pass
 
@@ -309,6 +322,18 @@ def true_sendall(self, data, *args, **kwargs):
             host, port = Mocket._address
             host = true_gethostbyname(host)
 
+            if isinstance(self.true_socket, true_socket) and self._secure_socket:
+                try:
+                    self = MocketSocket(sock=self)
+                except TypeError:
+                    ssl_context = self.kwargs.get("ssl_context")
+                    server_hostname = self.kwargs.get("server_hostname")
+                    self.true_socket = true_ssl_context.wrap_socket(
+                        self=ssl_context,
+                        sock=self.true_socket,
+                        server_hostname=server_hostname,
+                    )
+
             try:
                 self.true_socket.connect((host, port))
             except (OSError, socket.error, ValueError):
@@ -342,7 +367,7 @@ def true_sendall(self, data, *args, **kwargs):
                         )
                     )
 
-        # response back to .sendall() which writes it to the mocket socket and flush the BytesIO
+        # response back to .sendall() which writes it to the Mocket socket and flush the BytesIO
         return encoded_response
 
     def send(self, data, *args, **kwargs):  # pragma: no cover
@@ -438,11 +463,20 @@ def enable(namespace=None, truesocket_recording_dir=None):
             (2, 1, 6, "", (host, port))
         ]
         ssl.wrap_socket = ssl.__dict__["wrap_socket"] = FakeSSLContext.wrap_socket
-        ssl.SSLSocket = ssl.__dict__["SSLSocket"] = MocketSocket
+        # ssl.SSLSocket = ssl.__dict__["SSLSocket"] = MocketSocket
         ssl.SSLContext = ssl.__dict__["SSLContext"] = FakeSSLContext
         socket.inet_pton = socket.__dict__["inet_pton"] = lambda family, ip: byte_type(
             "\x7f\x00\x00\x01", "utf-8"
         )
+        urllib3.util.ssl_.wrap_socket = urllib3.util.ssl_.__dict__[
+            "wrap_socket"
+        ] = FakeSSLContext.wrap_socket
+        urllib3.util.ssl_.ssl_wrap_socket = urllib3.util.ssl_.__dict__[
+            "ssl_wrap_socket"
+        ] = FakeSSLContext.wrap_socket
+        urllib3.connection.ssl_wrap_socket = urllib3.connection.__dict__[
+            "ssl_wrap_socket"
+        ] = FakeSSLContext.wrap_socket
         if pyopenssl_override:
             # Take out the pyopenssl version - use the default implementation
             extract_from_urllib3()
@@ -459,9 +493,18 @@ def disable():
         socket.gethostbyname = socket.__dict__["gethostbyname"] = true_gethostbyname
         socket.getaddrinfo = socket.__dict__["getaddrinfo"] = true_getaddrinfo
         ssl.wrap_socket = ssl.__dict__["wrap_socket"] = true_ssl_wrap_socket
-        ssl.SSLSocket = ssl.__dict__["SSLSocket"] = true_ssl_socket
+        # ssl.SSLSocket = ssl.__dict__["SSLSocket"] = true_ssl_socket
         ssl.SSLContext = ssl.__dict__["SSLContext"] = true_ssl_context
         socket.inet_pton = socket.__dict__["inet_pton"] = true_inet_pton
+        urllib3.util.ssl_.wrap_socket = urllib3.util.ssl_.__dict__[
+            "wrap_socket"
+        ] = true_urllib3_wrap_socket
+        urllib3.util.ssl_.ssl_wrap_socket = urllib3.util.ssl_.__dict__[
+            "ssl_wrap_socket"
+        ] = true_urllib3_ssl_wrap_socket
+        urllib3.connection.ssl_wrap_socket = urllib3.connection.__dict__[
+            "ssl_wrap_socket"
+        ] = true_urllib3_ssl_wrap_socket
         Mocket.reset()
         if pyopenssl_override:
             # Put the pyopenssl version back in place

shippable.yaml

@@ -5,7 +5,7 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  #- 3.7
+  - 3.7
   - pypy
   - pypy3
 

tests/main/test_http.py

@@ -269,8 +269,8 @@ def test_same_url_different_methods(self):
 
         methods_from_responses = [r["method"] for r in responses]
         contents_from_responses = [r["content"] for r in responses]
-        self.assertEquals(methods, methods_from_responses)
-        self.assertEquals(list(range(len(methods))), contents_from_responses)
+        self.assertEqual(methods, methods_from_responses)
+        self.assertEqual(list(range(len(methods))), contents_from_responses)
 
     @mocketize
     def test_request_bodies(self):

tests/main/test_https.py

@@ -43,10 +43,11 @@ def test_json(response):
 @pytest.mark.skipif('os.getenv("SKIP_TRUE_HTTP", False)')
 @mocketize(truesocket_recording_dir=recording_directory)
 def test_truesendall_with_recording_https():
-    url = 'https://httpbin.org/ip'
+    url = 'https://mockbin.com/ip'
 
-    requests.get(url)
-    resp = requests.get(url)
+    requests.get(url, headers={"Accept": "application/json"})
+    resp = requests.get(url, headers={"Accept": "application/json"})
+    print(resp.content)
     assert resp.status_code == 200
 
     dump_filename = os.path.join(
@@ -56,15 +57,15 @@ def test_truesendall_with_recording_https():
     with io.open(dump_filename) as f:
         responses = json.load(f)
 
-    assert len(responses['httpbin.org']['443'].keys()) == 1
+    assert len(responses['mockbin.com']['443'].keys()) == 1
 
 
 @pytest.mark.skipif('os.getenv("SKIP_TRUE_HTTP", False)')
 def test_truesendall_after_mocket_session():
     Mocket.enable()
     Mocket.disable()
 
-    url = 'https://httpbin.org/ip'
+    url = 'https://mockbin.com/ip'
     resp = requests.get(url)
     assert resp.status_code == 200
 
@@ -73,8 +74,8 @@ def test_truesendall_after_mocket_session():
 def test_real_request_session():
     session = requests.Session()
 
-    url1 = 'https://httpbin.org/ip'
-    url2 = 'https://httpbin.org/headers'
+    url1 = 'https://mockbin.com/ip'
+    url2 = 'http://mockbin.com/request'
 
     with Mocketizer():
         assert len(session.get(url1).content) < len(session.get(url2).content)