VkApi.security_check: fix (?)

Author: python273

vk_api/vk_api.py

@@ -21,20 +21,24 @@
 RE_CAPTCHAID = re.compile(r'sid=(\d+)')
 RE_NUMBER_HASH = re.compile(r'security_check.*?hash: \'(.*?)\'\};')
 RE_TOKEN_URL = re.compile(r'location\.href = "(.*?)"\+addr;')
+
 RE_PHONE_PREFIX = re.compile(r'phone_number">(.*?)<')
-RE_PHONE_POSTFIX = re.compile(r'phone_postfix">(.*?)<')
+RE_PHONE_PREFIX_2 = re.compile(r'label ta_r">\+(\d+)')
+RE_PHONE_POSTFIX = re.compile(r'phone_postfix">.*?(\d+).*?<')
 
 
 class VkApi(object):
 
-    def __init__(self, login=None, password=None, number=None, token=None,
+    def __init__(self, login=None, password=None, number=None, sec_number=None,
+                 token=None,
                  proxies=None, captcha_handler=None, config_filename=None,
                  api_version='5.24', app_id=2895443, scope=2097151):
         """
         :param login: Логин ВКонтакте
         :param password: Пароль ВКонтакте
         :param number: Номер для проверке безопасности (указывать, если
                                      в качестве логина используется не номер)
+        :param sec_number: 
 
         :param token: access_token
         :param proxies: proxy server
@@ -51,6 +55,7 @@ def __init__(self, login=None, password=None, number=None, token=None,
         self.login = login
         self.password = password
         self.number = number
+        self.sec_number = sec_number
 
         self.sid = None
         self.token = {'access_token': token}
@@ -151,12 +156,17 @@ def security_check(self, url=None, response=None):
             if 'security_check' not in response.url:
                 return
 
-        phone_prefix = search_re(RE_PHONE_PREFIX, response.text).strip()
-        phone_postfix = search_re(RE_PHONE_POSTFIX, response.text).strip()
+        phone_prefix = search_re(RE_PHONE_PREFIX, response.text)
+        if not phone_prefix:
+            phone_prefix = search_re(RE_PHONE_PREFIX_2, response.text)
+
+        phone_postfix = search_re(RE_PHONE_POSTFIX, response.text)
 
-        if self.number:
+        if self.sec_number:
+            code = self.sec_number
+        elif self.number:
             code = code_from_number(phone_prefix, phone_postfix, self.number)
-        else:
+        elif self.login:
             code = code_from_number(phone_prefix, phone_postfix, self.login)
 
         if code:
@@ -340,19 +350,19 @@ def doc(method=None):
 
 def search_re(reg, string):
     """ Поиск по регулярке """
-    m = reg.search(string)
-    groups = m.groups()
+    s = reg.search(string)
 
-    if groups:
+    if s:
+        groups = s.groups()
         return groups[0]
 
 
 def code_from_number(phone_prefix, phone_postfix, number):
     prefix_len = len(phone_prefix)
     postfix_len = len(phone_postfix)
 
-    if number[0] != '+':
-        number = '+' + number
+    if number[0] == '+':
+        number = number[1:]
 
     if (prefix_len + postfix_len) >= len(number):
         return