4.7 small fix

Author: python273

.gitignore

@@ -6,4 +6,5 @@ upload_to_PyPi.py
 .project
 .pydevproject
 .settings/
-.idea/
+.idea/
+/testing

MANIFEST

@@ -2,7 +2,7 @@
 setup.py
 jconfig\__init__.py
 jconfig\jconfig.py
-test\test.py
 vk_api\__init__.py
 vk_api\vk_api.py
+vk_api\vk_tools.py
 vk_api\vk_upload.py

example.py

@@ -5,7 +5,7 @@
 @contact: http://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2013
+Copyright (C) 2014
 '''
 
 import vk_api

jconfig/__init__.py

@@ -5,12 +5,12 @@
 @contact: http://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2013
+Copyright (C) 2014
 '''
 
 __author__ = "Kirill Python"
 __version__ = "1.1"
-__email__ = "mikeking568@gmail.com"
+__email__ = "siberianpython@gmail.com"
 __contact__ = "https://vk.com/python273"
 
 

jconfig/jconfig.py

@@ -5,7 +5,7 @@
 @contact: http://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2013
+Copyright (C) 2014
 '''
 
 import os

vk_api/__init__.py

@@ -5,12 +5,12 @@
 @contact: http://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2013
+Copyright (C) 2014
 '''
 
 __author__ = "Kirill Python"
-__version__ = "4.6.6"
-__email__ = "mikeking568@gmail.com"
+__version__ = "4.7"
+__email__ = "siberianpython@gmail.com"
 __contact__ = "https://vk.com/python273"
 
 import sys

vk_api/vk_api.py

@@ -5,7 +5,7 @@
 @contact: http://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2013
+Copyright (C) 2014
 '''
 
 import jconfig

vk_api/vk_tools.py

@@ -1,4 +1,13 @@
 # encoding: utf-8
+
+'''
+@author: Kirill Python
+@contact: http://vk.com/python273
+@license Apache License, Version 2.0, see LICENSE file
+
+Copyright (C) 2014
+'''
+
 import json
 import sys
 
@@ -80,4 +89,8 @@ def get_all_slow(self, method, values=None, max_count=200, key='items'):
         return {'count': len(items), key: items}
 
 # Полный код в файле vk_procedures
-code_get_all_items = 'var z=%s,x=%s,y=%s,k="%s",p={"count":z}+y,r=API.%s(p),c=r["count"],j=r[k],o=0,i=1;while(i<25&&o<c){o=i*z+x;p={"count":z,"offset":o}+y;r=API.%s(p);j=j+r[k];i=i+1;};return{"count":c,"items":j,"offset":o,"end":o+z>=c};'
+code_get_all_items = '''
+var z=%s,x=%s,y=%s,k="%s",p={"count":z}+y,r=API.%s(p),c=r["count"],j=r[k],o=0,
+i=1;while(i<25&&o<c){o=i*z+x;p={"count":z,"offset":o}+y;r=API.%s(p);j=j+r[k];i
+=i+1;};return{"count":c,"items":j,"offset":o,"end":o+z>=c};
+'''.replace('\n', '')

vk_api/vk_upload.py

@@ -5,7 +5,7 @@
 @contact: http://vk.com/python273
 @license Apache License, Version 2.0, see LICENSE file
 
-Copyright (C) 2013
+Copyright (C) 2014
 '''
 
 
@@ -20,7 +20,7 @@ def photo(self, photos, album_id=None, group_id=None):
         photos = ['photo1.jpg', 'img.png']
                = 'screen.png'
                Максимум 5 фотографий
-        
+
         album_id
         '''
 
@@ -73,7 +73,8 @@ def photoMessages(self, photos, group_id=None):
             values.update({'group_id': group_id})
 
         # Получаем ссылку для загрузки
-        url = self.vk.method('photos.getMessagesUploadServer', values)['upload_url']
+        url = self.vk.method('photos.getMessagesUploadServer', values)
+        url = url['upload_url']
 
         # Загружаем
         photos_files = openPhotos(photos)
@@ -96,6 +97,7 @@ def openPhotos(photos_paths):
 
     return photos
 
+
 def closePhotos(photos):
     for i in photos:
         photos[i].close()