Merge branch 'dev'

Author: python273

.gitignore

@@ -1,10 +1,7 @@
 build/
 dist/
-test/
 *.pyc
-upload_to_PyPi.py
 .project
 .pydevproject
 .settings/
-.idea/
 /testing

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='vk_api',
-    version='6.0',
+    version='6.1',
     author='Kirill Python',
     author_email='python273@ya.ru',
     url='https://github.com/python273/vk_api',

vk_api/__init__.py

@@ -9,7 +9,7 @@
 """
 
 __author__ = 'Kirill Python'
-__version__ = '6.0'
+__version__ = '6.1'
 __email__ = 'python273@ya.ru'
 __contact__ = 'https://vk.com/python273'
 

vk_api/vk_api.py

@@ -14,10 +14,12 @@
 import time
 
 DELAY = 0.36  # 3 requests per second
+TOO_MANY_RPS_CODE = 6
 CAPTCHA_ERROR_CODE = 14
 NEED_VALIDATION_CODE = 17
 HTTP_ERROR_CODE = -1
 
+RE_LOGIN_HASH = re.compile(r'name="lg_h" value="([a-z0-9]+)"')
 RE_CAPTCHAID = re.compile(r'sid=(\d+)')
 RE_NUMBER_HASH = re.compile(r"al_page: '3', hash: '([a-z0-9]+)'")
 RE_TOKEN_URL = re.compile(r'location\.href = "(.*?)"\+addr;')
@@ -83,7 +85,8 @@ def __init__(self, login=None, password=None, number=None, sec_number=None,
 
         self.error_handlers = {
             NEED_VALIDATION_CODE: self.need_validation_handler,
-            CAPTCHA_ERROR_CODE: captcha_handler or self.captcha_handler
+            CAPTCHA_ERROR_CODE: captcha_handler or self.captcha_handler,
+            TOO_MANY_RPS_CODE: self.too_many_rps_handler
         }
 
     def authorization(self):
@@ -103,12 +106,16 @@ def authorization(self):
     def vk_login(self, captcha_sid=None, captcha_key=None):
         """ Авторизация ВКонтакте с получением cookies remixsid """
 
-        url = 'https://login.vk.com/'
+        self.http.cookies.clear()
+
+        # Get cookies
+        response = self.http.get('https://vk.com/')
+
         values = {
             'act': 'login',
-            'utf8': '1',
             'email': self.login,
-            'pass': self.password
+            'pass': self.password,
+            'lg_h': search_re(RE_LOGIN_HASH, response.text)
         }
 
         if captcha_sid and captcha_key:
@@ -117,8 +124,7 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
                 'captcha_key': captcha_key
             })
 
-        self.http.cookies.clear()
-        response = self.http.post(url, values)
+        response = self.http.post('https://login.vk.com/', values)
 
         remixsid = None
 
@@ -270,6 +276,10 @@ def http_handler(self, error):
         """ Handle connection errors """
         pass
 
+    def too_many_rps_handler(self, error):
+        time.sleep(0.5)
+        error.try_method()
+
     def method(self, method, values=None, captcha_sid=None, captcha_key=None):
         """ Использование методов API
 
@@ -320,10 +330,9 @@ def method(self, method, values=None, captcha_sid=None, captcha_key=None):
 
         if 'error' in response:
             error = ApiError(self, method, values, response['error'])
-            error_code = error.code
 
-            if error_code in self.error_handlers:
-                if error_code == CAPTCHA_ERROR_CODE:
+            if error.code in self.error_handlers:
+                if error.code == CAPTCHA_ERROR_CODE:
 
                     error = Captcha(
                         self,
@@ -334,7 +343,7 @@ def method(self, method, values=None, captcha_sid=None, captcha_key=None):
                         error.error['captcha_img']
                     )
 
-                response = self.error_handlers[error_code](error)
+                response = self.error_handlers[error.code](error)
 
                 if response is not None:
                     return response