Merge branch 'dev'

Author: python273

jconfig/__init__.py

@@ -5,7 +5,7 @@
 @contact: https://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2015
+Copyright (C) 2016
 """
 
 __author__ = 'Kirill Python'

jconfig/jconfig.py

@@ -5,7 +5,7 @@
 @contact: https://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2015
+Copyright (C) 2016
 """
 
 import json

setup.py

@@ -6,17 +6,17 @@
 @contact: http://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2015
+Copyright (C) 2016
 '''
 
 from distutils.core import setup
 
 
 setup(
     name='vk_api',
-    version='7.1',
+    version='7.2',
     author='Kirill Python',
-    author_email='python273@ya.ru',
+    author_email='whoami@python273.pw',
     url='https://github.com/python273/vk_api',
     description='Module for writing scripts for vk.com (vkontakte)',
     download_url='https://github.com/python273/vk_api/archive/master.zip',

vk_api/__init__.py

@@ -5,11 +5,11 @@
 @contact: https://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2015
+Copyright (C) 2016
 """
 
 __author__ = 'Kirill Python'
-__version__ = '7.1'
+__version__ = '7.2'
 __email__ = 'python273@ya.ru'
 __contact__ = 'https://vk.com/python273'
 

vk_api/vk_api.py

@@ -5,7 +5,7 @@
 @contact: https://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2015
+Copyright (C) 2016
 """
 
 import re
@@ -120,7 +120,7 @@ def authorization(self, reauth=False):
             if not self.check_sid():
                 self.vk_login()
             else:
-                self.security_check('https://vk.com/')
+                self.security_check('https://vk.com/settings')
 
             if not self.check_token():
                 self.api_login()
@@ -365,13 +365,15 @@ def auth_handler(self):
     def get_api(self):
         return VkApiMethod(self)
 
-    def method(self, method, values=None, captcha_sid=None, captcha_key=None):
+    def method(self, method, values=None, captcha_sid=None, captcha_key=None, raw=False):
         """ Использование методов API
 
         :param method: метод
         :param values: параметры
         :param captcha_sid:
         :param captcha_key:
+        :param raw: при False возвращает response['response'], при True возвращает response
+                    e.g. может понадобиться для метода execute для получения execute_errors
         """
 
         url = 'https://api.vk.com/method/%s' % method
@@ -435,7 +437,7 @@ def method(self, method, values=None, captcha_sid=None, captcha_key=None):
 
             raise error
 
-        return response['response']
+        return response if raw else response['response']
 
 
 class VkApiMethod:

vk_api/vk_tools.py

@@ -5,7 +5,7 @@
 @contact: https://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2015
+Copyright (C) 2016
 """
 
 import json
@@ -111,21 +111,28 @@ def get_all_slow(self, method, max_count, values=None, key='items',
 class VkRequestsPool(object):
     """ Позволяет сделать несколько обращений к API за один запрос
         за счет метода execute
+
+        Если ответ от API приходит в виде list'а (например при вызове users.get),
+        то значение записывается с ключем list {'list': [...]}
     """
 
-    __slots__ = ('vk', 'pool', 'one_param')
+    __slots__ = ('vk', 'pool', 'one_param', 'execute_errors')
 
     def __init__(self, vk):
         self.vk = vk
         self.pool = []
         self.one_param = False
+        self.execute_errors = []
 
     def __enter__(self):
         return self
 
     def __exit__(self, *args, **kwargs):
         self.execute()
 
+    def get_execute_errors(self):
+        return self.execute_errors
+
     def method(self, method, values=None):
         """ Добавляет запрос в пулл
 
@@ -169,7 +176,7 @@ def method_one_param(self, method, default_values=None, key=None,
 
     def check_one_method(self, pool):
         """ Возвращает True, если все запросы в пулле к одному методу """
-        if len(pool) > 1:
+        if pool:
             first_method = pool[0][0]
 
             for req in pool[1:]:
@@ -225,22 +232,30 @@ def execute(self):
 
             if self.one_param:
                 run_code = self.gen_code_one_param(cur_pool)
+            elif self.check_one_method(cur_pool):
+                run_code = self.gen_code_one_method(cur_pool)
             else:
-                one_method = self.check_one_method(cur_pool)
+                run_code = self.gen_code_many_methods(cur_pool)
 
-                if one_method:
-                    run_code = self.gen_code_one_method(cur_pool)
-                else:
-                    run_code = self.gen_code_many_methods(cur_pool)
+            response_raw = self.vk.method('execute', {'code': run_code}, raw=True)
 
-            response = self.vk.method('execute', {'code': run_code})
+            response = response_raw['response']
+            response_errors = response_raw.get('execute_errors')
+
+            if response_errors:
+                self.execute_errors += response_errors[:-1]
 
             for x in range(len(response)):
                 if self.one_param:
-                    self.one_param['return'][cur_pool[x]] = response[x]
+                    if response[x] is False:
+                        self.one_param['return'][cur_pool[x]] = {'_error': True}
+                    else:
+                        self.one_param['return'][cur_pool[x]] = response[x]
                 else:
                     if response[x] is False:
                         self.pool[i + x][2].update({'_error': True})
+                    elif type(response[x]) is list:
+                        self.pool[i + x][2].update({'list': response[x]})
                     else:
                         self.pool[i + x][2].update(response[x])
 

vk_api/vk_upload.py

@@ -5,7 +5,7 @@
 @contact: https://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2015
+Copyright (C) 2016
 """
 
 
@@ -112,7 +112,7 @@ def photo_wall(self, photos, user_id=None, group_id=None):
 
         return response
 
-    def audio(self, file_path, artist, title):
+    def audio(self, file_path, **kwargs):
         """ Загрузка аудио
 
         :param file_path: путь к аудиофайлу
@@ -127,10 +127,7 @@ def audio(self, file_path, artist, title):
 
         response = self.vk.http.post(url, files=audio_file).json()
 
-        response.update({
-            'artist': artist,
-            'title': title
-        })
+        response.update(kwargs)
 
         response = self.vk.method('audio.save', response)