Merge pull request #22 from neatc0der/release/v2.1.1

Release/v2.1.1

Author: neatc0der

changelog/v2.1.1.md

@@ -0,0 +1,4 @@
+# v2.1.1
+
+* Fixes [proxy support](https://github.com/neatc0der/mkdocs-markmap/issues/20)
+* Replaces usage of `urllib3` with `requests`

mkdocs_markmap/__meta__.py

@@ -1,6 +1,6 @@
 PACKAGE_NAME = 'mkdocs_markmap'
 PROJECT_NAME = PACKAGE_NAME.replace('_', '-')
-PROJECT_VERSION = '2.1.0'
+PROJECT_VERSION = '2.1.1'
 
 OWNER = 'neatc0der'
 REPOSITORY_NAME = f'{OWNER}/{PROJECT_NAME}'

mkdocs_markmap/utils.py

@@ -3,10 +3,11 @@
 from pathlib import Path
 
 from urllib.parse import unquote
-from urllib3 import PoolManager
-from urllib3.response import HTTPResponse
-from urllib3.util.retry import Retry
-from urllib3.util.url import Url, parse_url
+from requests.adapters import HTTPAdapter
+from requests import Response
+from requests.packages.urllib3.util.retry import Retry
+from requests.packages.urllib3.util.url import Url, parse_url
+from requests.sessions import Session
 
 
 log = logging.getLogger('mkdocs.markmap')
@@ -19,12 +20,18 @@ def download(base_path: Path, url: str, flat: bool = False, force_reload: bool =
     file_path: Path = base_path / sub_path
 
     file_path.parent.mkdir(parents=True, exist_ok=True)
-    retries = Retry(connect=5, read=2, redirect=5)
-    http = PoolManager(retries=retries)
     if force_reload or not file_path.exists():
-        response: HTTPResponse = http.request('GET', url)
+        retries: Retry = Retry(connect=5, read=2, redirect=5)
+        adapter: HTTPAdapter = HTTPAdapter(max_retries=retries)
+        http: Session = Session()
+        http.mount("https://", adapter)
+        http.mount("http://", adapter)
+
+        response: Response = http.get(url, allow_redirects=True, timeout=3.0)
         with open(file_path, 'wb') as fp:
-            fp.write(response.data)
+            for chunk in response.iter_content(chunk_size=1024): 
+                if chunk:
+                    fp.write(chunk)
 
     log.info(f'script downloaded: {url}')
 

requirements/prod.txt

@@ -1,4 +1,4 @@
 mkdocs>=1.1,<2
 attrs==20.3.0
 beautifulsoup4>=4.6.3
-urllib3==1.26.4
+requests==2.25.1

tasks.py

@@ -18,7 +18,7 @@
 
 @task
 def verify(c, tag=TARGET_TAG):
-    print('verify integrity: {tag}')
+    print(f'verify integrity: {tag}')
 
     handler: ReleaseHandler = ReleaseHandler(tag)
     handler.verify()