3 request per second limit

API version 5.4
Get number from login for security check
vk_tools

Author: python273

MANIFEST

@@ -1,8 +1,8 @@
-# file GENERATED by distutils, do NOT edit
-setup.py
-jconfig\__init__.py
-jconfig\jconfig.py
-test\test.py
-vk_api\__init__.py
-vk_api\vk_api.py
-vk_api\vk_upload.py
+# file GENERATED by distutils, do NOT edit
+setup.py
+jconfig\__init__.py
+jconfig\jconfig.py
+test\test.py
+vk_api\__init__.py
+vk_api\vk_api.py
+vk_api\vk_upload.py

setup.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 '''
@@ -8,13 +9,10 @@
 Copyright (C) 2013
 '''
 
-#!/usr/bin/env python
-""" Setup file for vk_api package """
-
 from distutils.core import setup
 setup(name='vk_api',
-      version='4.6',
-      description='Module to use API VKontakte vk.com',
+      version='4.6.3',
+      description='Module to use API vk.com',
       author='Kirill Python',
       author_email='mikeking568@gmail.com',
       url='https://github.com/python273/vk_api',

vk_api/__init__.py

@@ -9,7 +9,7 @@
 '''
 
 __author__ = "Kirill Python"
-__version__ = "4.6"
+__version__ = "4.6.3"
 __email__ = "mikeking568@gmail.com"
 __contact__ = "https://vk.com/python273"
 
@@ -18,6 +18,8 @@
 if sys.version_info[0] == 2:
     from vk_api import *
     from vk_upload import *
+    from vk_tools import *
 else:
     from .vk_api import *
     from .vk_upload import *
+    from .vk_tools import *

vk_api/vk_api.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 '''
 @author: Kirill Python
 @contact: http://vk.com/python273
@@ -6,26 +8,26 @@
 Copyright (C) 2013
 '''
 
-# -*- coding: utf-8 -*-
 import jconfig
 import re
 import requests
-# import time
+import time
+
+DELAY = 1.0 / 3  # 3 requests per second
 
 
 class VkApi(object):
     def __init__(self,
                  login=None, password=None, number=None,
-                 sid=None, token=None,
+                 token=None,
                  proxies=None,
-                 version='5.0', app_id=2895443, scope=2097151):
+                 version='5.4', app_id=2895443, scope=2097151):
         '''
         :param login: Логин ВКонтакте
         :param password: Пароль ВКонтакте
         :param number: Номер при проверке безопасности
                         Номер: +7 12345678 90
                         number = 12345678
-        :param sid: cookie remixsid
         :param token: access_token
         :param proxies: proxy server
                         {'http': 'http://127.0.0.1:8888/',
@@ -39,7 +41,7 @@ def __init__(self,
         self.password = password
         self.number = number
 
-        self.sid = sid
+        self.sid = None
         self.token = {'access_token': token}
 
         self.version = version
@@ -56,6 +58,8 @@ def __init__(self,
         }
         self.http.verify = False
 
+        self.last_request = 0.0
+
         if login and password:
             self.sid = self.settings['remixsid']
             self.token = self.settings['access_token']
@@ -106,7 +110,24 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
         else:
             raise authorization_error('Authorization error (bad password)')
 
-        if 'security_check' in response.url and self.number:
+        if 'security_check' in response.url:
+            self.security_check(response)
+
+    def security_check(self, url=None, response=None):
+        if url:
+            response = self.http.get(url)
+
+        # Проверяем, является ли логин номером
+        if not self.number:
+            phone_postfix = regexp(r'class="phone_postfix">(.*?)</span>',
+                                   response.text)
+
+            phone_postfix = phone_postfix[0].strip()
+
+            if self.login[-len(phone_postfix):] == phone_postfix:
+                self.number = self.login
+
+        if self.number:
             number_hash = regexp(r'security_check.*?hash: \'(.*?)\'\};',
                                  response.text)[0]
 
@@ -122,9 +143,10 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
             response = self.http.post('https://vk.com/login.php', values)
 
             if response.text.split('<!>')[4] == '4':
-                return
+                return True
+
+        raise authorization_error('Security check (enter number)')
 
-        raise authorization_error('Authorization error (enter number)')
 
     def check_sid(self):
         ''' Прверка Cookies remixsid на валидность '''
@@ -180,37 +202,54 @@ def check_token(self):
         if self.token:
             try:
                 self.method('isAppUser')
-            except api_error:
+            except apiError:
                 return False
 
             return True
 
     def method(self, method, values=None):
         ''' Использование методов API
 
-            method - название метода
+            param: method - название метода
                         'users.get'
 
-            values - параметры
+            param: values - параметры
                         {'uids': 1}
         '''
-
         url = 'https://api.vk.com/method/%s' % method
-        values = values or {}
+
+        if values:
+            values = values.copy()
+        else:
+            values = {}
 
         if not 'v' in values:
             values.update({'v': self.version})
 
         if self.token:
             values.update({'access_token': self.token['access_token']})
 
+        # Ограничение 3 запроса в секунду
+        sleep = DELAY - (time.time() - self.last_request)
+
+        if sleep > 0:
+            time.sleep(sleep)
+
         response = self.http.post(url, values).json()
+        self.last_request = time.time()
+
         if 'error' in response:
             # TODO: write me
             # Capcha handler
             # Capcha object
-            # Error #17 handler
-            raise api_error(response['error'])
+
+            error = apiError(response['error'], self, method, values)
+
+            if error.code == 17:
+                print 'HANDLER 17'
+                # TODO: number handler
+
+            raise error
         else:
             return response['response']
 
@@ -231,10 +270,21 @@ class authorization_error(vk_api_error):
     pass
 
 
-class api_error(vk_api_error):
-    pass
+class apiError(Exception):
+    def __init__(self, error, vk, method, values):
+        self.error = error
+        self.vk = vk
+        self.method = method
+        self.values = values
+        self.code = error['error_code']
+
+    def try_method(self):
+        return self.vk.method(self.method, self.values)
+
+    def __str__(self):
+        return self.error['error_msg']
 
 
-class capcha():
+class Capcha():
     pass
 

vk_api/vk_tools.py

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+
+class VkTools(object):
+    def __init__(self, vk):
+        self.vk = vk
+
+    def get_all_items(self, method, values=None, max_count=200):
+        ''' Получить все элементы
+            Работает в методах, где в ответе есть count и items
+
+        :param method: метод
+        :param values: параметры
+        :param max_count: максимальное количество,
+                            которое можно получить за один раз
+        '''
+
+        if not values:
+            values = {}
+        else:
+            values = values.copy()
+
+        values.update({'count': max_count})
+
+        response = self.vk.method(method, values)
+        count = response['count']
+        items = response['items']
+
+        for i in xrange(max_count, count + 1, max_count):
+            values.update({
+                'offset': i
+            })
+
+            response = self.vk.method(method, values)
+            items += response['items']
+
+        return {'count': len(items), 'items': items}