Testing out Python 3.10 (#156)

* Adding support for Python 3.10

Author: mindflayer

.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, pypy3]
+        python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10.0-rc.2", "pypy3"]
 
     steps:
     - uses: actions/checkout@v2

Makefile

@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-VERSION := $(shell python -c 'import mocket; print(mocket.__version__)')
-
 install-dev-requirements:
 	pip install pipenv==2020.11.15
 
@@ -11,7 +9,7 @@ install-test-requirements:
 
 test-python:
 	@echo "Running Python tests"
-	pipenv run python setup.py -q test || exit 1
+	pipenv run python run_tests.py || exit 1
 	@echo ""
 
 lint-python:
@@ -30,6 +28,7 @@ safetest:
 	export SKIP_TRUE_REDIS=1; export SKIP_TRUE_HTTP=1; make test
 
 publish: install-test-requirements
+	VERSION := $(shell python -c 'import mocket; print(mocket.__version__)')
 	pipenv run python -m build --sdist .
 	pipenv run twine upload dist/mocket-$(VERSION).tar.gz
 	pipenv run anaconda upload dist/mocket-$(VERSION).tar.gz

conftest.py

@@ -2,4 +2,4 @@
 
 __all__ = ("mocketize", "Mocket", "MocketEntry", "Mocketizer")
 
-__version__ = "3.9.44"
+__version__ = "3.10.0"

mocket/__init__.py

@@ -1,6 +1,5 @@
-import decorator
-
 from mocket import Mocketizer
+from mocket.utils import get_mocketize
 
 
 async def wrapper(test, cls=Mocketizer, truesocket_recording_dir=None, *args, **kwargs):
@@ -22,10 +21,7 @@ async def wrapper(test, cls=Mocketizer, truesocket_recording_dir=None, *args, **
         return await test(*args, **kwargs)
 
 
-if decorator.__version__ < "5":
-    async_mocketize = decorator.decorator(wrapper)
-else:
-    async_mocketize = decorator.decorator(wrapper, kwsyntax=True)
+async_mocketize = get_mocketize(wrapper_=wrapper)
 
 
 __all__ = ("async_mocketize",)

mocket/async_mocket.py

@@ -12,14 +12,13 @@
 from datetime import datetime, timedelta
 from json.decoder import JSONDecodeError
 
-import decorator
 import urllib3
 from urllib3.connection import match_hostname as urllib3_match_hostname
 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 basestring, byte_type, decode_from_bytes, encode_to_bytes, text_type
-from .utils import SSL_PROTOCOL, MocketSocketCore, hexdump, hexload
+from .utils import SSL_PROTOCOL, MocketSocketCore, get_mocketize, hexdump, hexload
 
 xxh32 = None
 try:
@@ -65,6 +64,11 @@ def __set__(self, *args):
 
 
 class FakeSSLContext(SuperFakeSSLContext):
+    DUMMY_METHODS = (
+        "load_default_certs",
+        "load_verify_locations",
+        "set_alpn_protocols",
+    )
     sock = None
     post_handshake_auth = None
     _check_hostname = False
@@ -78,6 +82,8 @@ def check_hostname(self, *args):
         self._check_hostname = False
 
     def __init__(self, sock=None, server_hostname=None, _context=None, *args, **kwargs):
+        self._set_dummy_methods()
+
         if isinstance(sock, MocketSocket):
             self.sock = sock
             self.sock._host = server_hostname
@@ -89,13 +95,12 @@ def __init__(self, sock=None, server_hostname=None, _context=None, *args, **kwar
         elif isinstance(sock, int) and true_ssl_context:
             self.context = true_ssl_context(sock)
 
-    @staticmethod
-    def load_default_certs(*args, **kwargs):
-        pass
+    def _set_dummy_methods(self):
+        def dummy_method(*args, **kwargs):
+            pass
 
-    @staticmethod
-    def load_verify_locations(*args, **kwargs):
-        pass
+        for m in self.DUMMY_METHODS:
+            setattr(self, m, dummy_method)
 
     @staticmethod
     def wrap_socket(sock=sock, *args, **kwargs):
@@ -640,7 +645,4 @@ def wrapper(test, cls=Mocketizer, truesocket_recording_dir=None, *args, **kwargs
         return test(*args, **kwargs)
 
 
-if decorator.__version__ < "5":
-    mocketize = decorator.decorator(wrapper)
-else:
-    mocketize = decorator.decorator(wrapper, kwsyntax=True)
+mocketize = get_mocketize(wrapper_=wrapper)

mocket/mocket.py

@@ -34,3 +34,12 @@ def hexload(string):
     """
     string_no_spaces = "".join(string.split())
     return encode_to_bytes(binascii.unhexlify(string_no_spaces))
+
+
+def get_mocketize(wrapper_):
+    import decorator
+
+    if decorator.__version__ < "5":
+        return decorator.decorator(wrapper_)
+    else:
+        return decorator.decorator(wrapper_, kwsyntax=True)

mocket/utils.py

@@ -49,7 +49,6 @@ def read_version(package):
         "dev": [],
         "pook": pook_requires,  # plugins version supporting mocket.plugins.pook.MocketEngine
     },
-    test_suite="run_tests.main",
     license="BSD",
     classifiers=[
         "Development Status :: 6 - Mature",