make default Client.get deprecated into _get

dcard/forums.py

@@ -26,7 +26,7 @@ def __call__(self, name):
         return self
 
     def get(self, no_school=False):
-        forums = self.client.get(api.forums_url)
+        forums = self.client.get_json(api.forums_url)
         if no_school:
             return [forum for forum in self._extract_general(forums)]
         return forums
@@ -65,7 +65,7 @@ def eager_for_metas(bundle):
 
         def get_single_page_metas():
             while True:
-                yield self.client.get(self.posts_meta_url, params=params)
+                yield self.client.get_json(self.posts_meta_url, params=params)
 
         paged_metas = zip(count(start=1), get_single_page_metas())
 

dcard/posts.py

@@ -74,7 +74,7 @@ def get_comments_serial(self, post_id):
         params = {}
         comments = []
         while True:
-            _comments = self.client.get(comments_url, params=params)
+            _comments = self.client.get_json(comments_url, params=params)
             if len(_comments) == 0:
                 break
             comments += _comments

dcard/utils.py

@@ -24,7 +24,7 @@ def __init__(self, workers=8):
             status_forcelist=[500, 502, 503, 504])
         self.req_session.mount('https://', HTTPAdapter(max_retries=self.retries))
 
-    def get(self, url, **kwargs):
+    def _get(self, url, **kwargs):
         try:
             response = self.req_session.get(url, **kwargs)
             data = response.json()
@@ -39,7 +39,7 @@ def get(self, url, **kwargs):
                 'when get {}, error {}; and retry#{}...'
                 .format(url, e, man_retry))
             kwargs['man_retry'] = man_retry + 1
-            return self.get(url, **kwargs)
+            return self._get(url, **kwargs)
         except ServerResponsedError:
             logger.error(
                 'when get {}, error {}; status_code {}'
@@ -59,6 +59,10 @@ def get_stream(self, url, **kwargs):
     def fut_get(self, url, **kwargs):
         return FutureRequest(self, self.fut_session.get(url, **kwargs))
 
+    def get_json(self, url, **kwargs):
+        request = self.fut_get(url, **kwargs)
+        return request.json()
+
 
 class FutureRequest:
 

tests/test_utils.py

@@ -5,19 +5,19 @@
 class TestClient:
 
     def test_get_and_server_responsed_error(self, client):
-        resp = client.get('https://test-for-error')
+        resp = client._get('https://test-for-error')
         assert resp == {}
 
     def test_get_and_value_error_with_man_retry(self, client):
-        resp = client.get('https://test-for-error', error='ValueError')
+        resp = client._get('https://test-for-error', error='ValueError')
         assert resp == {}
 
     def test_get_and_httplib_incomplete_read(self, client):
-        resp = client.get('https://test-for-error', error='IncompleteRead')
+        resp = client._get('https://test-for-error', error='IncompleteRead')
         assert resp == {}
 
     def test_get_and_keep_retry_error(self, client):
-        resp = client.get('https://test-for-error', error='RetryError')
+        resp = client._get('https://test-for-error', error='RetryError')
         assert resp is None
 
     def test_get_stream(self, client):