Fix failing tests and address ABCMeta Issue.

* ABCMeta typing issue with requests package * python/mypy#5264 (comment) * Run pytest and remove broken test as functionality was removed.
robinhood-unofficial · Apr 12, 2020 · de2018c · de2018c
1 parent 1ede853
commit de2018c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/pyrh/models/sessionmanager.py b/pyrh/models/sessionmanager.py
@@ -3,7 +3,7 @@
 import uuid
 from datetime import datetime, timedelta
 from pathlib import Path
-from typing import Any, Dict, Optional, Union, cast, overload
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union, cast, overload
 from urllib.request import getproxies
 
 import pytz
@@ -34,9 +34,13 @@
 """Path to login.json config file."""
 CACHE_LOGIN.touch(exist_ok=True)
 
-HTTPHeader = CaseInsensitiveDict[str]
+if TYPE_CHECKING:
+    CaseInsensitiveDictType = CaseInsensitiveDict[str]
+else:
+    CaseInsensitiveDictType = CaseInsensitiveDict
+
 Proxies = Dict[str, str]
-HEADERS: HTTPHeader = HTTPHeader(
+HEADERS: CaseInsensitiveDictType = CaseInsensitiveDict(
     {
         "Accept": "*/*",
         "Accept-Encoding": "gzip, deflate",
@@ -102,7 +106,7 @@ def __init__(
         username: str,
         password: str,
         challenge_type: Optional[str] = "email",
-        headers: Optional[HTTPHeader] = None,
+        headers: Optional[CaseInsensitiveDictType] = None,
         proxies: Optional[Proxies] = None,
     ) -> None:
         self.session: requests.Session = requests.session()
@@ -171,7 +175,7 @@ def get(
         url: Union[str, URL],
         params: Optional[Dict[str, Any]] = None,
         *,
-        headers: Optional[HTTPHeader] = None,
+        headers: Optional[CaseInsensitiveDictType] = None,
         raise_errors: bool = True,
         return_response: Literal[True],
         auto_login: bool = True,
@@ -184,7 +188,7 @@ def get(
         url: Union[str, URL],
         params: Optional[Dict[str, Any]] = None,
         *,
-        headers: Optional[HTTPHeader] = None,
+        headers: Optional[CaseInsensitiveDictType] = None,
         raise_errors: bool = True,
         return_response: Literal[False] = ...,
         auto_login: bool = True,
@@ -196,7 +200,7 @@ def get(
         url: Union[str, URL],
         params: Optional[Dict[str, Any]] = None,
         *,
-        headers: Optional[HTTPHeader] = None,
+        headers: Optional[CaseInsensitiveDictType] = None,
         raise_errors: bool = True,
         return_response: bool = False,
         auto_login: bool = True,
@@ -239,7 +243,7 @@ def post(
         url: Union[str, URL],
         data: Optional[JSON] = None,
         *,
-        headers: Optional[HTTPHeader] = None,
+        headers: Optional[CaseInsensitiveDictType] = None,
         raise_errors: bool = True,
         return_response: Literal[True],
         auto_login: bool = True,
@@ -252,7 +256,7 @@ def post(
         url: Union[str, URL],
         data: Optional[JSON] = None,
         *,
-        headers: Optional[HTTPHeader] = None,
+        headers: Optional[CaseInsensitiveDictType] = None,
         raise_errors: bool = True,
         return_response: Literal[False] = ...,
         auto_login: bool = True,
@@ -264,7 +268,7 @@ def post(
         url: Union[str, URL],
         data: Optional[JSON] = None,
         *,
-        headers: Optional[HTTPHeader] = None,
+        headers: Optional[CaseInsensitiveDictType] = None,
         raise_errors: bool = True,
         return_response: bool = False,
         auto_login: bool = True,

diff --git a/tests/test_sessionmanager.py b/tests/test_sessionmanager.py
@@ -449,20 +449,17 @@ def test_post(mock_login, sm):
     sm.session.mount("mock", adapter)
     mock_url = "mock://test.com"
     expected = [
-        {"text": "", "status_code": 200, "headers": {"Content-Length": "0"}},
         {"text": '{"error": "login error"}', "status_code": 401},
         {"text": '{"test": "321"}', "status_code": 200},
         {"text": '{"error": "resource not found"}', "status_code": 404},
     ]
     adapter.register_uri("POST", mock_url, expected)
 
     resp1 = sm.post(mock_url)
-    resp2 = sm.post(mock_url)
 
     with pytest.raises(HTTPError) as e:
         sm.post(mock_url)
 
-    assert resp1 == {}
-    assert resp2 == json.loads(expected[2]["text"])
+    assert resp1 == json.loads(expected[1]["text"])
     assert mock_login.call_count == 1
     assert "404 Client Error" in str(e.value)