Fix VkApi.method raw arg passing from exception via .try_again()

Author: python273

vk_api/exceptions.py

@@ -62,17 +62,18 @@ def __str__(self):
 
 class ApiError(VkApiError):
 
-    def __init__(self, vk, method, values, error):
+    def __init__(self, vk, method, values, raw, error):
         self.vk = vk
         self.method = method
         self.values = values
+        self.raw = raw
         self.code = error['error_code']
         self.error = error
 
     def try_method(self):
         """ Отправить запрос заново """
 
-        return self.vk.method(self.method, self.values)
+        return self.vk.method(self.method, self.values, raw=self.raw)
 
     def __str__(self):
         return '[{}] {}'.format(self.error['error_code'],
@@ -81,16 +82,17 @@ def __str__(self):
 
 class ApiHttpError(VkApiError):
 
-    def __init__(self, vk, method, values, response):
+    def __init__(self, vk, method, values, raw, response):
         self.vk = vk
         self.method = method
         self.values = values
+        self.raw = raw
         self.response = response
 
     def try_method(self):
         """ Отправить запрос заново """
 
-        return self.vk.method(self.method, self.values)
+        return self.vk.method(self.method, self.values, raw=self.raw)
 
     def __str__(self):
         return 'Response code {}'.format(self.response.status_code)

vk_api/vk_api.py

@@ -483,6 +483,8 @@ def too_many_rps_handler(self, error):
         :param error: исключение
         """
 
+        self.logger.warning('Too many requests! Sleeping 0.5 sec...')
+
         time.sleep(0.5)
         return error.try_method()
 
@@ -551,7 +553,7 @@ def method(self, method, values=None, captcha_sid=None, captcha_key=None,
         if response.ok:
             response = response.json()
         else:
-            error = ApiHttpError(self, method, values, response)
+            error = ApiHttpError(self, method, values, raw, response)
             response = self.http_handler(error)
 
             if response is not None:
@@ -560,7 +562,7 @@ def method(self, method, values=None, captcha_sid=None, captcha_key=None,
             raise error
 
         if 'error' in response:
-            error = ApiError(self, method, values, response['error'])
+            error = ApiError(self, method, values, raw, response['error'])
 
             if error.code in self.error_handlers:
                 if error.code == CAPTCHA_ERROR_CODE: