Use python-socks for core socks functionality

romis2012 · Sep 20, 2020 · 75ad26d · 75ad26d
1 parent 67821e3
commit 75ad26d
Show file tree

Hide file tree

Showing 43 changed files with 17 additions and 2,354 deletions.
diff --git a/README.md b/README.md
@@ -4,12 +4,15 @@
 [![Coverage Status](https://coveralls.io/repos/github/romis2012/aiohttp-socks/badge.svg?branch=master&_=x)](https://coveralls.io/github/romis2012/aiohttp-socks?branch=master)
 [![PyPI version](https://badge.fury.io/py/aiohttp-socks.svg)](https://badge.fury.io/py/aiohttp-socks)
 
-Proxy connector for [aiohttp](https://github.com/aio-libs/aiohttp). 
-SOCKS4(a), SOCKS5, HTTP (tunneling), Proxy chains are supported.
+The `aiohttp-socks` package provides a proxy connector for [aiohttp](https://github.com/aio-libs/aiohttp). 
+Supports SOCKS4(a), SOCKS5, HTTP (tunneling) as well as Proxy chains.
+It uses [python-socks](https://github.com/romis2012/python-socks) for core proxy functionality.
+
 
 ## Requirements
 - Python >= 3.6
 - aiohttp >= 2.3.2
+- python-socks[asyncio,trio] >= 1.0.1
 
 ## Installation
 ```

diff --git a/aiohttp_socks/__init__.py b/aiohttp_socks/__init__.py
@@ -1,7 +1,7 @@
 __title__ = 'aiohttp-socks'
-__version__ = '0.5.3'
+__version__ = '0.5.4'
 
-from .core_socks import (
+from python_socks import (
     ProxyError,
     ProxyTimeoutError,
     ProxyConnectionError,

diff --git a/aiohttp_socks/_deprecated.py b/aiohttp_socks/_deprecated.py
@@ -1,6 +1,6 @@
 import warnings
 
-from .core_socks import (
+from python_socks import (
     ProxyError,
     ProxyConnectionError,
     ProxyType

diff --git a/aiohttp_socks/connector.py b/aiohttp_socks/connector.py
@@ -5,9 +5,9 @@
 from aiohttp import TCPConnector
 from aiohttp.abc import AbstractResolver
 
-from .core_socks import ProxyType, parse_proxy_url
-from .core_socks.async_ import ProxyChain
-from .core_socks.async_.asyncio import Proxy
+from python_socks import ProxyType, parse_proxy_url
+from python_socks.async_ import ProxyChain
+from python_socks.async_.asyncio import Proxy
 
 
 class NoResolver(AbstractResolver):

diff --git a/aiohttp_socks/core_socks/__init__.py b/aiohttp_socks/core_socks/__init__.py
diff --git a/aiohttp_socks/core_socks/_basic_auth.py b/aiohttp_socks/core_socks/_basic_auth.py
diff --git a/aiohttp_socks/core_socks/_errors.py b/aiohttp_socks/core_socks/_errors.py
diff --git a/aiohttp_socks/core_socks/_helpers.py b/aiohttp_socks/core_socks/_helpers.py
diff --git a/aiohttp_socks/core_socks/_proto_http.py b/aiohttp_socks/core_socks/_proto_http.py
diff --git a/aiohttp_socks/core_socks/_proto_http_async.py b/aiohttp_socks/core_socks/_proto_http_async.py
diff --git a/aiohttp_socks/core_socks/_proto_http_sync.py b/aiohttp_socks/core_socks/_proto_http_sync.py
diff --git a/aiohttp_socks/core_socks/_proto_socks4.py b/aiohttp_socks/core_socks/_proto_socks4.py