Some cleaning/refactoring (#168)

* Some cleaning/refactoring.
* Improving coverage.

Author: mindflayer

.coveragerc

@@ -2,7 +2,6 @@
 omit =
     *.egg/*
     *site-packages*
-    *compat.py
 
 [report]
 exclude_lines =

mocket/compat.py

@@ -26,7 +26,7 @@ def shsplit(s):
     return shlex.split(s)
 
 
-def do_the_magic(lib_magic, body):
+def do_the_magic(lib_magic, body):  # pragma: no cover
     if hasattr(lib_magic, "from_buffer"):
         # PyPI python-magic
         return lib_magic.from_buffer(body, mime=True)

mocket/mocket.py

@@ -158,10 +158,7 @@ def __init__(
         self._truesocket_recording_dir = None
         self.kwargs = kwargs
 
-    def __unicode__(self):  # pragma: no cover
-        return str(self)
-
-    def __str__(self):  # pragma: no cover
+    def __str__(self):
         return "({})(family={} type={} protocol={})".format(
             self.__class__.__name__, self.family, self.type, self.proto
         )

mocket/plugins/httpretty/__init__.py

@@ -107,10 +107,9 @@ def __init__(self):
 
     def __getattr__(self, name):
         if name == "last_request":
-            last_request = getattr(Mocket, "last_request")()
-            return last_request
+            return Mocket.last_request()
         if name == "latest_requests":
-            return getattr(Mocket, "_requests")
+            return Mocket._requests
         return getattr(Entry, name)
 
 

mocket/utils.py

@@ -39,6 +39,6 @@ def hexload(string):
 def get_mocketize(wrapper_):
     import decorator
 
-    if decorator.__version__ < "5":
+    if decorator.__version__ < "5":  # pragma: no cover
         return decorator.decorator(wrapper_)
     return decorator.decorator(wrapper_, kwsyntax=True)

run_tests.py

@@ -13,7 +13,6 @@ def main(args=None):
     if not any(a for a in args[1:] if not a.startswith("-")):
         args.append("tests/main")
         args.append("mocket")
-        args.append("tests/tests35")
 
         if major == 3 and minor >= 7:
             args.append("tests/tests37")

setup.py

@@ -1,13 +1,10 @@
 import io
 import os
-import sys
 
 from setuptools import find_packages, setup
 
 os.environ.setdefault("PIPENV_SKIP_LOCK", "1")
 
-major, minor = sys.version_info[:2]
-
 install_requires = [
     line
     for line in io.open(

tests/__init__.py

@@ -1,12 +0,0 @@
-from __future__ import unicode_literals
-import sys
-
-PY2 = sys.version_info[0] == 2
-
-if PY2:
-    from urllib2 import urlopen, HTTPError
-    from urllib import urlencode
-else:
-    from urllib.request import urlopen
-    from urllib.parse import urlencode
-    from urllib.error import HTTPError

tests/main/test_http.py

@@ -1,21 +1,21 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import io
 import json
 import os
 import socket
 import tempfile
 import time
 from unittest import TestCase
+from urllib.error import HTTPError
+from urllib.parse import urlencode
+from urllib.request import urlopen
 
 import mock
 import pytest
 import requests
 
 from mocket import Mocket, mocketize
 from mocket.mockhttp import Entry, Response
-from tests import HTTPError, urlencode, urlopen
 
 recording_directory = tempfile.mkdtemp()
 

tests/tests35/test_http_aiohttp.py tests/main/test_http_aiohttp.pytests/tests35/test_http_aiohttp.py renamed to tests/main/test_http_aiohttp.py

@@ -13,13 +13,13 @@
 class AioHttpEntryTestCase(TestCase):
     @mocketize
     def test_http_session(self):
-        url = 'http://httpbin.org/ip'
+        url = "http://httpbin.org/ip"
         body = "asd" * 100
         Entry.single_register(Entry.GET, url, body=body, status=404)
-        Entry.single_register(Entry.POST, url, body=body*2, status=201)
+        Entry.single_register(Entry.POST, url, body=body * 2, status=201)
 
-        async def main(l):
-            async with aiohttp.ClientSession(loop=l) as session:
+        async def main(_loop):
+            async with aiohttp.ClientSession(loop=_loop) as session:
                 with async_timeout.timeout(3):
                     async with session.get(url) as get_response:
                         assert get_response.status == 404
@@ -29,7 +29,7 @@ async def main(l):
                     async with session.post(url, data=body * 6) as post_response:
                         assert post_response.status == 201
                         assert await post_response.text() == body * 2
-                        assert Mocket.last_request().method == 'POST'
+                        assert Mocket.last_request().method == "POST"
                         assert Mocket.last_request().body == body * 6
 
         loop = asyncio.get_event_loop()
@@ -39,13 +39,13 @@ async def main(l):
 
     @mocketize
     def test_https_session(self):
-        url = 'https://httpbin.org/ip'
+        url = "https://httpbin.org/ip"
         body = "asd" * 100
         Entry.single_register(Entry.GET, url, body=body, status=404)
-        Entry.single_register(Entry.POST, url, body=body*2, status=201)
+        Entry.single_register(Entry.POST, url, body=body * 2, status=201)
 
-        async def main(l):
-            async with aiohttp.ClientSession(loop=l) as session:
+        async def main(_loop):
+            async with aiohttp.ClientSession(loop=_loop) as session:
                 with async_timeout.timeout(3):
                     async with session.get(url) as get_response:
                         assert get_response.status == 404
@@ -63,19 +63,20 @@ async def main(l):
 
     @httprettified
     def test_httprettish_session(self):
-        url = 'https://httpbin.org/ip'
+        url = "https://httpbin.org/ip"
         HTTPretty.register_uri(
             HTTPretty.GET,
             url,
-            body=json.dumps(dict(origin='127.0.0.1')),
+            body=json.dumps(dict(origin="127.0.0.1")),
         )
 
-        async def main(l):
-            async with aiohttp.ClientSession(loop=l) as session:
+        async def main(_loop):
+            async with aiohttp.ClientSession(loop=_loop) as session:
                 with async_timeout.timeout(3):
                     async with session.get(url) as get_response:
                         assert get_response.status == 200
                         assert await get_response.text() == '{"origin": "127.0.0.1"}'
+
         loop = asyncio.get_event_loop()
         loop.set_debug(True)
         loop.run_until_complete(main(loop))