Some refactoring

Author: python273

vk_api/tools.py

@@ -53,10 +53,7 @@ def get_all_iter(self, method, max_count, values=None, key='items',
         :type limit: int
         """
 
-        if values:
-            values = values.copy()
-        else:
-            values = {}
+        values = values.copy() if values else {}
 
         items_count = 0
         offset = 0
@@ -111,21 +108,16 @@ def get_all_slow_iter(self, method, max_count, values=None, key='items',
                             но может прийти больше
         """
 
-        if not values:
-            values = {}
-        else:
-            values = values.copy()
+        values = values.copy() if values else {}
 
-        values.update({'count': max_count})
+        values['count'] = max_count
 
         response = self.vk.method(method, values)
         count = response['count']
         items_count = 0
 
-        for i in range(max_count, count + 1, max_count):
-            values.update({
-                'offset': i
-            })
+        for offset in range(max_count, count + 1, max_count):
+            values['offset'] = offset
 
             response = self.vk.method(method, values)
             items = response[key]

vk_api/vk_api.py

@@ -26,7 +26,9 @@
 RE_LOGIN_HASH = re.compile(r'name="lg_h" value="([a-z0-9]+)"')
 RE_CAPTCHAID = re.compile(r"onLoginCaptcha\('(\d+)'")
 RE_NUMBER_HASH = re.compile(r"al_page: '3', hash: '([a-z0-9]+)'")
-RE_AUTH_HASH = re.compile(r"\{.*?act: 'a_authcheck_code'.+?hash: '([a-z_0-9]+)'.*?\}")
+RE_AUTH_HASH = re.compile(
+    r"\{.*?act: 'a_authcheck_code'.+?hash: '([a-z_0-9]+)'.*?\}"
+)
 RE_TOKEN_URL = re.compile(r'location\.href = "(.*?)"\+addr;')
 
 RE_PHONE_PREFIX = re.compile(r'label ta_r">\+(.*?)<')
@@ -372,7 +374,7 @@ def too_many_rps_handler(self, error):
         return error.try_method()
 
     def auth_handler(self):
-        raise AuthError("No handler for two-factor authorization.")
+        raise AuthError('No handler for two-factor authentication')
 
     def get_api(self):
         return VkApiMethod(self)
@@ -389,23 +391,17 @@ def method(self, method, values=None, captcha_sid=None, captcha_key=None, raw=Fa
         """
 
         url = 'https://api.vk.com/method/%s' % method
-
-        if values:
-            values = values.copy()
-        else:
-            values = {}
+        values = values.copy() if values else {}
 
         if 'v' not in values:
-            values.update({'v': self.api_version})
+            values['v'] = self.api_version
 
         if self.token:
-            values.update({'access_token': self.token['access_token']})
+            values['access_token'] = self.token['access_token']
 
         if captcha_sid and captcha_key:
-            values.update({
-                'captcha_sid': captcha_sid,
-                'captcha_key': captcha_key
-            })
+            values['captcha_sid'] = captcha_sid
+            values['captcha_key'] = captcha_key
 
         with self.lock:
             # Ограничение 3 запроса в секунду