fix: tests and styles

examples/find_and_use.py

@@ -49,7 +49,7 @@ async def get_pages(urls, proxy_pool, timeout=10, loop=None):
 def main():
     loop = asyncio.get_event_loop()
 
-    proxies = asyncio.Queue(loop=loop)
+    proxies = asyncio.Queue()
     proxy_pool = ProxyPool(proxies)
 
     judges = [

proxybroker/api.py

@@ -65,7 +65,7 @@ def __init__(
         **kwargs,
     ):
         self._loop = loop or asyncio.get_event_loop()
-        self._proxies = queue or asyncio.Queue(loop=self._loop)
+        self._proxies = queue or asyncio.Queue()
         self._resolver = Resolver(loop=self._loop)
         self._timeout = timeout
         self._verify_ssl = verify_ssl
@@ -97,7 +97,7 @@ def __init__(
             max_tries = attempts_conn
 
         # The maximum number of concurrent checking proxies
-        self._on_check = asyncio.Queue(maxsize=max_conn, loop=self._loop)
+        self._on_check = asyncio.Queue(maxsize=max_conn)
         self._max_tries = max_tries
         self._judges = judges
         self._providers = [

proxybroker/checker.py

@@ -340,6 +340,7 @@ def _get_anonymity_lvl(real_ext_ip, proxy, judge, content):
 class ProxyChecker(Checker):
     def __init__(self, *args, **kwargs):
         warnings.warn(
-            '`ProxyChecker` is deprecated, use `Checker` instead.', DeprecationWarning,
+            '`ProxyChecker` is deprecated, use `Checker` instead.',
+            DeprecationWarning,
         )
         super().__init__(*args, **kwargs)

proxybroker/cli.py

@@ -210,7 +210,10 @@ def add_grab_args(group):
 
 def add_serve_args(group):
     group.add_argument(
-        '--host', type=str, default='127.0.0.1', help='Host of local proxy server',
+        '--host',
+        type=str,
+        default='127.0.0.1',
+        help='Host of local proxy server',
     )
     group.add_argument(
         '--port', type=int, default=8888, help='Port of local proxy server'
@@ -380,7 +383,7 @@ def cli(args=sys.argv[1:]):
         ns.types.append(('HTTP', ns.anon_lvl))
 
     loop = asyncio.get_event_loop()
-    proxies = asyncio.Queue(loop=loop)
+    proxies = asyncio.Queue()
     broker = Broker(
         proxies,
         max_conn=ns.max_conn,

proxybroker/judge.py

@@ -33,8 +33,7 @@ def __init__(self, url, timeout=8, verify_ssl=False, loop=None):
         self._resolver = Resolver(loop=self._loop)
 
     def __repr__(self):
-        """Class representation
-        """
+        """Class representation"""
         return '<Judge [%s] %s>' % (self.scheme, self.host)
 
     @classmethod

proxybroker/negotiators.py

@@ -1,3 +1,4 @@
+import asyncio
 import struct
 from abc import ABC, abstractmethod
 from socket import inet_aton
@@ -61,6 +62,8 @@ async def negotiate(self, **kwargs):
         await self._proxy.send(struct.pack('3B', 5, 1, 0))
         resp = await self._proxy.recv(2)
 
+        if not isinstance(resp, (bytes, str)):
+            raise TypeError(f"{type(resp).__name__} is not supported")
         if resp[0] == 0x05 and resp[1] == 0xFF:
             self._proxy.log('Failed (auth is required)', err=BadResponseError)
             raise BadResponseError
@@ -92,6 +95,9 @@ async def negotiate(self, **kwargs):
 
         await self._proxy.send(struct.pack('>2BH5B', 4, 1, port, *bip, 0))
         resp = await self._proxy.recv(8)
+        if isinstance(resp, asyncio.Future):
+            resp = await resp
+        assert not isinstance(resp, asyncio.Future)
 
         if resp[0] != 0x00 or resp[1] != 0x5A:
             self._proxy.log('Failed (invalid data)', err=BadResponseError)

proxybroker/providers.py

@@ -720,7 +720,8 @@ def __init__(self, *args, **kwargs):
         proto=('HTTP', 'CONNECT:80', 'HTTPS', 'CONNECT:25'),
     ),  # 200
     Provider(
-        url='http://cn-proxy.com/', proto=('HTTP', 'CONNECT:80', 'HTTPS', 'CONNECT:25'),
+        url='http://cn-proxy.com/',
+        proto=('HTTP', 'CONNECT:80', 'HTTPS', 'CONNECT:25'),
     ),  # 70
     Provider(
         url='https://hugeproxies.com/home/',

proxybroker/utils.py

@@ -58,6 +58,8 @@ def get_all_ip(page):
 
 def get_status_code(resp, start=9, stop=12):
     try:
+        if not isinstance(resp, (bytes, str)):
+            raise TypeError(f'{type(resp).__name__} is not supported')
         code = int(resp[start:stop])
     except ValueError:
         return 400  # Bad Request

tests/test_negotiators.py

@@ -44,13 +44,13 @@ def test_base_attrs(proxy, ngtr, check_anon_lvl, use_full_path):
         (
             'SOCKS5',
             80,
-            future_iter(b'\x05\x00', b'\x05\x00\x00\x01\xc0\xa8\x00\x18\xce\xdf'),
+            [b'\x05\x00', b'\x05\x00\x00\x01\xc0\xa8\x00\x18\xce\xdf'],
             [call(b'\x05\x01\x00'), call(b'\x05\x01\x00\x01\x7f\x00\x00\x01\x00P')],
         ),
         (
             'SOCKS5',
             443,
-            future_iter(b'\x05\x00', b'\x05\x00'),
+            [b'\x05\x00', b'\x05\x00'],
             [call(b'\x05\x01\x00'), call(b'\x05\x01\x00\x01\x7f\x00\x00\x01\x01\xbb')],
         ),  # noqa
         (
@@ -85,7 +85,7 @@ async def test_socks_negotiate(proxy, ngtr, port, recv, expected):
     'ngtr,recv,expected',
     [
         # wrong response:
-        ('SOCKS5', future_iter(b'\x05\xff'), [call(b'\x05\x01\x00')]),
+        ('SOCKS5', [b'\x05\xff'], [call(b'\x05\x01\x00')]),
         (
             'SOCKS4',
             future_iter(b'HTTP/1.1 400 Bad Request'),
@@ -94,7 +94,7 @@ async def test_socks_negotiate(proxy, ngtr, port, recv, expected):
         # failed to connect:
         (
             'SOCKS5',
-            future_iter(b'\x05\x00', b'\x05\x05'),
+            (b'\x05\x00', b'\x05\x05'),
             [call(b'\x05\x01\x00'), call(b'\x05\x01\x00\x01\x7f\x00\x00\x01\x00P')],
         ),  # noqa
         (
@@ -122,19 +122,20 @@ async def test_socks_negotiate_error(proxy, ngtr, recv, expected):
         (
             'CONNECT:80',
             80,
-            future_iter(b'HTTP/1.1 200 Connection established\r\n\r\n'),
+            [b'HTTP/1.1 200 Connection established\r\n\r\n'],
         ),  # noqa
         (
             'CONNECT:25',
             25,
-            future_iter(
-                b'HTTP/1.1 200 Connection established\r\n\r\n', b'220 smtp2.test.com',
-            ),
+            [
+                b'HTTP/1.1 200 Connection established\r\n\r\n',
+                b'220 smtp2.test.com',
+            ],
         ),  # noqa
         (
             'HTTPS',
             443,
-            future_iter(b'HTTP/1.1 200 Connection established\r\n\r\n'),
+            [b'HTTP/1.1 200 Connection established\r\n\r\n'],
         ),  # noqa
     ],
 )
@@ -155,21 +156,21 @@ async def test_connect_negotiate(proxy, ngtr, port, recv):
 @pytest.mark.parametrize(
     'ngtr,recv',
     [
-        ('CONNECT:80', future_iter(b'HTTP/1.1 400 Bad Request\r\n\r\n')),
+        ('CONNECT:80', [b'HTTP/1.1 400 Bad Request\r\n\r\n']),
         (
             'CONNECT:80',
-            future_iter(b'<html>\r\n<head><title>400 Bad Request</title></head>\r\n'),
+            [b'<html>\r\n<head><title>400 Bad Request</title></head>\r\n'],
         ),  # noqa
-        ('CONNECT:25', future_iter(b'HTTP/1.1 400 Bad Request\r\n\r\n')),
+        ('CONNECT:25', [b'HTTP/1.1 400 Bad Request\r\n\r\n']),
         (
             'CONNECT:25',
-            future_iter(b'<html>\r\n<head><title>400 Bad Request</title></head>\r\n'),
+            [b'<html>\r\n<head><title>400 Bad Request</title></head>\r\n'],
         ),  # noqa
-        ('CONNECT:25', future_iter(b'HTTP/1.1 200 OK\r\n\r\n', b'')),
-        ('HTTPS', future_iter(b'HTTP/1.1 400 Bad Request\r\n\r\n')),
+        ('CONNECT:25', [b'HTTP/1.1 200 OK\r\n\r\n', b'']),
+        ('HTTPS', [b'HTTP/1.1 400 Bad Request\r\n\r\n']),
         (
             'HTTPS',
-            future_iter(b'<html>\r\n<head><title>400 Bad Request</title></head>\r\n'),
+            [b'<html>\r\n<head><title>400 Bad Request</title></head>\r\n'],
         ),  # noqa
     ],
 )

tests/test_resolver.py

@@ -86,7 +86,9 @@ async def test_resolve_cache(event_loop, mocker, resolver):
 
     resolver._cached_hosts.clear()
     f = future_iter(
-        [ResolveResult('127.0.0.1', 0)], [ResolveResult('127.0.0.2', 0)], [Exception],
+        [ResolveResult('127.0.0.1', 0)],
+        [ResolveResult('127.0.0.2', 0)],
+        [Exception],
     )
     with mocker.patch('aiodns.DNSResolver.query', side_effect=f):
         await resolver.resolve('test.com')