python-proxy-headers 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

python_proxy_headers/urllib3_proxy_manager.py

@@ -3,6 +3,8 @@ from http.client import _read_headers
 from urllib3.connection import HTTPSConnection
 from urllib3.connectionpool import HTTPConnectionPool, HTTPSConnectionPool
 from urllib3.poolmanager import ProxyManager
+from urllib3.util.request import make_headers
+from urllib3.util.url import parse_url
 
 if sys.version_info < (3, 12, 0):
 	#####################################
@@ -128,6 +130,22 @@ class HTTPSProxyConnectionPool(HTTPSConnectionPool):
 
 class ProxyHeaderManager(ProxyManager):
 	def __init__(self, *args, **kwargs):
+		# urllib3.ProxyManager does not add Proxy-Authorization from user:pass in the
+		# proxy URL; requests does via HTTPAdapter.proxy_headers(). Merge URL auth here
+		# so direct proxy_from_url() matches requests and authenticates CONNECT.
+		proxy_url = kwargs.get("proxy_url")
+		if proxy_url is None and args:
+			proxy_url = args[0]
+		proxy_headers = kwargs.get("proxy_headers")
+		merged = dict(proxy_headers or {})
+		if isinstance(proxy_url, str):
+			parsed = parse_url(proxy_url)
+			if parsed.auth and not any(
+				k.lower() == "proxy-authorization" for k in merged
+			):
+				merged.update(make_headers(proxy_basic_auth=parsed.auth))
+		if merged != dict(proxy_headers or {}):
+			kwargs["proxy_headers"] = merged
 		super().__init__(*args, **kwargs)
 		self.pool_classes_by_scheme = {"http": HTTPConnectionPool, "https": HTTPSProxyConnectionPool}
 

{python_proxy_headers-0.2.1.dist-info → python_proxy_headers-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-proxy-headers
-Version: 0.2.1
+Version: 0.2.2
 Summary: Handle custom proxy headers for http & https requests in various python libraries
 Author-email: ProxyMesh <support@proxymesh.com>
 Project-URL: Homepage, https://github.com/proxymesh/python-proxy-headers

{python_proxy_headers-0.2.1.dist-info → python_proxy_headers-0.2.2.dist-info}/RECORD

@@ -5,9 +5,9 @@ python_proxy_headers/cloudscraper_proxy.py,sha256=6xF58QywHV4IYlC_KtXIWQTXZjE8Ce
 python_proxy_headers/httpx_proxy.py,sha256=Q8tDlfl4u3fjsZZDA1zj1pbN7fiAwJ3ctFGojbqtaEo,11829
 python_proxy_headers/pycurl_proxy.py,sha256=_JAt_o5gX7o0sRLOQXG3421mEehzBm-rhUl4c9IG5HQ,11738
 python_proxy_headers/requests_adapter.py,sha256=CfGEEYc0eaKKNA11VbhZzv9qFVEL1uMSzAUNvidIyEU,2313
-python_proxy_headers/urllib3_proxy_manager.py,sha256=FG6keO1ENBhVQLmnUkwVKpdC3U9xEXNxKGy9_7xjd_s,4399
-python_proxy_headers-0.2.1.dist-info/licenses/LICENSE,sha256=i_H6fvudjqZOKkZFCIHGmbPHIxszjCAT90UJSY2OM0U,1066
-python_proxy_headers-0.2.1.dist-info/METADATA,sha256=w0JKP-V8UL71NhYHlHtzk8ciIKNF_JCr_0eTXkUA_1g,6288
-python_proxy_headers-0.2.1.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-python_proxy_headers-0.2.1.dist-info/top_level.txt,sha256=Bhm-Qc6vn0DAd2Li8ZBn6KLkls2zJnM4-CtXHvIiRh8,21
-python_proxy_headers-0.2.1.dist-info/RECORD,,
+python_proxy_headers/urllib3_proxy_manager.py,sha256=ryT7QaCPb7lyQtHaP3v6MKfBerurBYrdRj4i-41ORT4,5196
+python_proxy_headers-0.2.2.dist-info/licenses/LICENSE,sha256=i_H6fvudjqZOKkZFCIHGmbPHIxszjCAT90UJSY2OM0U,1066
+python_proxy_headers-0.2.2.dist-info/METADATA,sha256=ltXQg143IYn7qLMgAjQihF4UJCUNurgBjSJfZPWcD1U,6288
+python_proxy_headers-0.2.2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+python_proxy_headers-0.2.2.dist-info/top_level.txt,sha256=Bhm-Qc6vn0DAd2Li8ZBn6KLkls2zJnM4-CtXHvIiRh8,21
+python_proxy_headers-0.2.2.dist-info/RECORD,,

{python_proxy_headers-0.2.1.dist-info → python_proxy_headers-0.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any