WIP: replace requests to cloudscraper, due to #140

Author: Hao Zhou

pixivpy3/__init__.py

@@ -1,7 +1,7 @@
 """
 Pixiv API library
 """
-__version__ = '3.5.9'
+__version__ = '3.5.10'
 
 from .papi import PixivAPI
 from .aapi import AppPixivAPI

pixivpy3/api.py

@@ -6,6 +6,7 @@
 from datetime import datetime
 
 import requests
+import cloudscraper
 
 from .utils import PixivError, JsonDict
 
@@ -26,7 +27,8 @@ class BasePixivAPI(object):
 
     def __init__(self, **requests_kwargs):
         """initialize requests kwargs if need be"""
-        self.requests = requests.Session()
+        # self.requests = requests.Session()
+        self.requests = cloudscraper.create_scraper()  # fix due to #140
         self.requests_kwargs = requests_kwargs
         self.additional_headers = {}
 
@@ -80,7 +82,7 @@ def auth(self, username=None, password=None, refresh_token=None):
         """Login with password, or use the refresh_token to acquire a new bearer token"""
         local_time = datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S+00:00')
         headers = {
-            'User-Agent': 'PixivAndroidApp/5.0.64 (Android 6.0)',
+            'User-Agent': 'PixivAndroidApp/5.0.115 (Android 6.0; PixivBot)',
             'X-Client-Time': local_time,
             'X-Client-Hash': hashlib.md5((local_time + self.hash_secret).encode('utf-8')).hexdigest(),
         }

requirements.txt

@@ -1,2 +1,3 @@
 requests>=2.0
 requests_toolbelt>=0.9.1
+cloudscraper>=1.0