PEP8

User-agent update

Author: python273

vk_api/vk_api.py

@@ -13,7 +13,7 @@
 import requests
 import time
 
-DELAY = 1.0 / 3  # 3 requests per second
+DELAY = 0.36  # 3 requests per second
 CAPTCHA_ERROR_CODE = 14
 NEED_VALIDATION_CODE = 17
 
@@ -59,8 +59,8 @@ def __init__(self, login=None, password=None, number=None, token=None,
         self.http = requests.Session()
         self.http.proxies = proxies  # Ставим прокси
         self.http.headers = {  # Притворимся браузером
-            'User-agent': 'Mozilla/5.0 (Windows NT 6.2; WOW64; rv:28.0) ' \
-                                            'Gecko/20100101 Firefox/28.0'
+            'User-agent': 'Mozilla/5.0 (Windows NT 6.2; WOW64; rv:30.0) '
+            'Gecko/20100101 Firefox/30.0'
         }
         self.http.verify = False
 
@@ -132,7 +132,7 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
     def security_check(self, url=None, response=None):
         if url:
             response = self.http.get(url)
-            if not 'security_check' in response.url:
+            if 'security_check' not in response.url:
                 return
 
         phone_prefix = regexp(r'label ta_r">(.*?)<',
@@ -199,7 +199,7 @@ def api_login(self):
 
         response = self.http.post(url, values)
 
-        if not 'access_token' in response.url:
+        if 'access_token' not in response.url:
             url = regexp(r'location\.href = "(.*?)"\+addr;', response.text)[0]
             response = self.http.get(url)
 
@@ -252,7 +252,7 @@ def method(self, method, values=None, captcha_sid=None, captcha_key=None):
         else:
             values = {}
 
-        if not 'v' in values:
+        if 'v' not in values:
             values.update({'v': self.api_version})
 
         if self.token:

vk_api/vk_tools.py

@@ -45,10 +45,9 @@ def get_all(self, method, values=None, max_count=200, key='items'):
         offset = 0
 
         while True:
-            run_code = code_get_all_items % (
-                                        max_count, offset, json.dumps(values),
-                                        key, method, method
-                                    )
+            run_code = code_get_all_items % (max_count, offset,
+                                             json.dumps(values), key,
+                                             method, method)
 
             response = self.vk.method('execute', {'code': run_code})
 

vk_api/vk_upload.py

@@ -53,7 +53,7 @@ def photo(self, photos, album_id,
 
         # Олег Илларионов:
         # это не могу к сожалению просто пофиксить
-        if not 'album_id' in response:
+        if 'album_id' not in response:
             response['album_id'] = response['aid']
 
         response.update({