Skip to content

Commit 8193e7f

Browse files
python273python273
committed
Merge pull request #3 from python273/dev
Dev
2 parents 5bce2e7 + aff8fc8 commit 8193e7f

12 files changed

Lines changed: 715 additions & 440 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ upload_to_PyPi.py
66
.project
77
.pydevproject
88
.settings/
9+
.idea/

‎MANIFEST‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
# file GENERATED by distutils, do NOT edit
2-
setup.py
3-
jconfig\__init__.py
4-
jconfig\jconfig.py
5-
test\test.py
6-
vk_api\__init__.py
7-
vk_api\vk_api.py
8-
vk_api\upload\__init__.py
9-
vk_api\upload\vk_upload.py
1+
# file GENERATED by distutils, do NOT edit
2+
setup.py
3+
jconfig\__init__.py
4+
jconfig\jconfig.py
5+
test\test.py
6+
vk_api\__init__.py
7+
vk_api\vk_api.py
8+
vk_api\vk_upload.py

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ vk_api
33

44
**vk_api** - модуль для использования API сайта ВКонтакте (vk.com). Пример смотрите в файле [example.py](https://github.com/python273/vk_api/blob/master/example.py)
55

6-
Тестовая поддержка **Python 3**!
6+
Python 2 / 3
77

88
С вопросами или советами можете [написать автору в ВК](https://vk.com/im?sel=183433824).
99

‎example.py‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
1-
'''
2-
@author: Kirill Python
3-
@contact: http://vk.com/python273
4-
@license Apache License, Version 2.0, see LICENSE file
5-
6-
Copyright (C) 2013
7-
'''
8-
9-
# -*- coding: utf-8 -*-
10-
import vk_api
11-
12-
13-
def main():
14-
u""" Пример получения последнего сообщения со стены """
15-
16-
login = u'python@vk.com'
17-
password = u'mypassword'
18-
19-
try:
20-
vk = vk_api.VkApi(login, password) # Авторизируемся
21-
except vk_api.authorization_error as error_msg:
22-
print(error_msg) # В случае ошибки выведем сообщение
23-
return # и выйдем
24-
25-
values = {
26-
'count': 1 # Получаем только одно сообщение
27-
}
28-
response = vk.method('wall.get', values) # Используем метод wall.get
29-
print(response[1]['text']) # Печатаем текст последнего поста со стены
30-
31-
if __name__ == '__main__':
32-
main()
1+
# -*- coding: utf-8 -*-
2+
3+
'''
4+
@author: Kirill Python
5+
@contact: http://vk.com/python273
6+
@license Apache License, Version 2.0, see LICENSE file
7+
8+
Copyright (C) 2013
9+
'''
10+
11+
import vk_api
12+
13+
14+
def main():
15+
u""" Пример получения последнего сообщения со стены """
16+
17+
login = u'python@vk.com'
18+
password = u'mypassword'
19+
20+
try:
21+
vk = vk_api.VkApi(login, password) # Авторизируемся
22+
except vk_api.AuthorizationError as error_msg:
23+
print(error_msg) # В случае ошибки выведем сообщение
24+
return # и выйдем
25+
26+
values = {
27+
'count': 1 # Получаем только один пост
28+
}
29+
response = vk.method('wall.get', values) # Используем метод wall.get
30+
31+
if response['items']:
32+
# Печатаем текст последнего поста со стены
33+
print(response['items'][0]['text'])
34+
35+
if __name__ == '__main__':
36+
main()

‎jconfig/__init__.py‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
'''
2-
@author: Kirill Python
3-
@contact: http://vk.com/python273
4-
@license Apache License, Version 2.0, see LICENSE file
5-
6-
Copyright (C) 2013
7-
'''
8-
9-
__author__ = "Kirill Python"
10-
__version__ = "1.1"
11-
__email__ = "mikeking568@gmail.com"
12-
__contact__ = "https://vk.com/python273"
13-
14-
15-
import sys
16-
if sys.version_info[0] == 2:
17-
from jconfig import *
18-
else:
19-
from .jconfig import *
1+
# -*- coding: utf-8 -*-
2+
3+
'''
4+
@author: Kirill Python
5+
@contact: http://vk.com/python273
6+
@license Apache License, Version 2.0, see LICENSE file
7+
8+
Copyright (C) 2013
9+
'''
10+
11+
__author__ = "Kirill Python"
12+
__version__ = "1.1"
13+
__email__ = "mikeking568@gmail.com"
14+
__contact__ = "https://vk.com/python273"
15+
16+
17+
import sys
18+
if sys.version_info[0] == 2:
19+
from jconfig import *
20+
else:
21+
from .jconfig import *

‎jconfig/jconfig.py‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,43 @@
1-
'''
2-
@author: Kirill Python
3-
@contact: http://vk.com/python273
4-
@license Apache License, Version 2.0, see LICENSE file
5-
6-
Copyright (C) 2013
7-
'''
8-
9-
# -*- coding: utf-8 -*-
10-
import os
11-
import json
12-
13-
14-
class config:
15-
def __init__(self, section, filename='config'):
16-
self.section = section # Секция настроек
17-
self.filename = filename # Файл с настройками
18-
self.all = self.parse() # Все настройки
19-
self.settings = self.all.get(section, {}) # Настройки секции
20-
21-
def __getitem__(self, item):
22-
return self.settings.get(item, {})
23-
24-
def __setitem__(self, key, value):
25-
self.settings.update({key: value})
26-
self.all.update({self.section: self.settings})
27-
self.update(self.all)
28-
29-
def parse(self):
30-
fileis = os.path.exists(self.filename)
31-
if fileis:
32-
settings = json.load(open(self.filename, 'r'))
33-
return settings
34-
else:
35-
self.update()
36-
return {}
37-
38-
def update(self, settings=None):
39-
if not settings:
40-
settings = {}
41-
42-
json.dump(settings, open(self.filename, 'w'))
1+
# -*- coding: utf-8 -*-
2+
3+
'''
4+
@author: Kirill Python
5+
@contact: http://vk.com/python273
6+
@license Apache License, Version 2.0, see LICENSE file
7+
8+
Copyright (C) 2013
9+
'''
10+
11+
import os
12+
import json
13+
14+
15+
class Config(object):
16+
def __init__(self, section, filename='config'):
17+
self.section = section # Секция настроек
18+
self.filename = filename # Файл с настройками
19+
self.all = self.parse() # Все настройки
20+
self.settings = self.all.get(section, {}) # Настройки секции
21+
22+
def __getitem__(self, item):
23+
return self.settings.get(item, {})
24+
25+
def __setitem__(self, key, value):
26+
self.settings.update({key: value})
27+
self.all.update({self.section: self.settings})
28+
self.update(self.all)
29+
30+
def parse(self):
31+
fileis = os.path.exists(self.filename)
32+
if fileis:
33+
settings = json.load(open(self.filename, 'r'))
34+
return settings
35+
else:
36+
self.update()
37+
return {}
38+
39+
def update(self, settings=None):
40+
if not settings:
41+
settings = {}
42+
43+
json.dump(settings, open(self.filename, 'w'))

‎setup.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#!/usr/bin/env python
2+
# -*- coding: utf-8 -*-
3+
14
'''
25
@author: Kirill Python
36
@contact: http://vk.com/python273
@@ -6,13 +9,10 @@
69
Copyright (C) 2013
710
'''
811

9-
#!/usr/bin/env python
10-
""" Setup file for vk_api package """
11-
1212
from distutils.core import setup
1313
setup(name='vk_api',
14-
version='4.6',
15-
description='Module to use API VKontakte vk.com',
14+
version='4.7',
15+
description='Module to use API vk.com',
1616
author='Kirill Python',
1717
author_email='mikeking568@gmail.com',
1818
url='https://github.com/python273/vk_api',

‎vk_api/__init__.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# -*- coding: utf-8 -*-
2+
13
'''
24
@author: Kirill Python
35
@contact: http://vk.com/python273
@@ -7,7 +9,7 @@
79
'''
810

911
__author__ = "Kirill Python"
10-
__version__ = "4.6"
12+
__version__ = "4.6.6"
1113
__email__ = "mikeking568@gmail.com"
1214
__contact__ = "https://vk.com/python273"
1315

@@ -16,6 +18,8 @@
1618
if sys.version_info[0] == 2:
1719
from vk_api import *
1820
from vk_upload import *
21+
from vk_tools import *
1922
else:
2023
from .vk_api import *
2124
from .vk_upload import *
25+
from .vk_tools import *

0 commit comments

Comments
 (0)