Merge branch 'dev'

Author: python273

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='vk_api',
-    version='7.2',
+    version='7.3',
     author='Kirill Python',
     author_email='whoami@python273.pw',
     url='https://github.com/python273/vk_api',

vk_api/__init__.py

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

vk_api/vk_api.py

@@ -24,7 +24,7 @@
 TWOFACTOR_CODE = -2
 
 RE_LOGIN_HASH = re.compile(r'name="lg_h" value="([a-z0-9]+)"')
-RE_CAPTCHAID = re.compile(r'sid=(\d+)')
+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"hash: '([a-z_0-9]+)'")
 RE_TOKEN_URL = re.compile(r'location\.href = "(.*?)"\+addr;')
@@ -120,7 +120,7 @@ def authorization(self, reauth=False):
             if not self.check_sid():
                 self.vk_login()
             else:
-                self.security_check('https://vk.com/settings')
+                self.security_check()
 
             if not self.check_token():
                 self.api_login()
@@ -134,7 +134,8 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
         response = self.http.get('https://vk.com/')
 
         values = {
-            'act': 'login',
+            'role': 'al_frame',
+            '_origin': 'https://vk.com',
             'utf8': '1',
             'email': self.login,
             'pass': self.password,
@@ -147,11 +148,11 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
                 'captcha_key': captcha_key
             })
 
-        response = self.http.post('https://login.vk.com/', values)
+        response = self.http.post('https://login.vk.com/?act=login', values)
 
         remixsid = None
 
-        if 'act=authcheck' in response.url:
+        if 'act=authcheck' in response.url:  # TODO: test/fix
             code, remember_device = self.error_handlers[TWOFACTOR_CODE]()
             response = self.twofactor(response, code, remember_device)
 
@@ -173,23 +174,24 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
 
             self.sid = remixsid
 
-        elif 'sid=' in response.url:
-            captcha_sid = search_re(RE_CAPTCHAID, response.url)
+        elif 'onLoginCaptcha(' in response.text:
+            captcha_sid = search_re(RE_CAPTCHAID, response.text)
             captcha = Captcha(self, captcha_sid, self.vk_login)
 
             if self.error_handlers[CAPTCHA_ERROR_CODE]:
                 return self.error_handlers[CAPTCHA_ERROR_CODE](captcha)
             else:
                 raise AuthorizationError('Authorization error (capcha)')
-        elif 'm=1' in response.url:
+        elif 'onLoginFailed(4' in response.text:
             raise BadPassword('Bad password')
         else:
-            raise AuthorizationError('Unknown error. Please send bugreport.')
+            raise AuthorizationError(
+                'Unknown error. Please send bugreport: https://vk.com/python273'
+            )
 
-        if 'security_check' in response.url:
-            self.security_check(response=response)
+        self.security_check()
 
-        if 'act=blocked' in response.url:
+        if 'act=blocked' in response.url:  # TODO: text/fix
             raise AccountBlocked('Account is blocked')
 
     def twofactor(self, response, code, remember_device=False):
@@ -220,9 +222,9 @@ def twofactor(self, response, code, remember_device=False):
                 return response
         raise TwoFactorError('Incorrect code: %s' % code)
 
-    def security_check(self, url=None, response=None):
-        if url:
-            response = self.http.get(url)
+    def security_check(self, response=None):
+        if response is None:
+            response = self.http.get('https://vk.com/settings')
             if 'security_check' not in response.url:
                 return