ukamnya
/
script.module.vk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Исправления для python 2.6

master
inpos 2017-02-04 13:31:50 +03:00
parent c81cfeed7a
commit c585c38288
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addon.xml
View File

@ -3,6 +3,7 @@
<requires> <requires>
<import addon="xbmc.python" version="2.14.0"/> <import addon="xbmc.python" version="2.14.0"/>
<import addon="script.module.requests" version="2.12.4"/> <import addon="script.module.requests" version="2.12.4"/>
<import addon="script.module.simplejson"/>
</requires> </requires>
<extension point="xbmc.python.module" library="lib" /> <extension point="xbmc.python.module" library="lib" />
<extension point="xbmc.addon.metadata"> <extension point="xbmc.addon.metadata">

8
lib/vk/api.py
View File

@ -7,12 +7,12 @@ from vk.logs import LOGGING_CONFIG
from vk.utils import stringify_values, json_iter_parse, LoggingSession, str_type from vk.utils import stringify_values, json_iter_parse, LoggingSession, str_type
from vk.exceptions import VkAuthError, VkAPIError from vk.exceptions import VkAuthError, VkAPIError
from vk.mixins import AuthMixin, InteractiveMixin from vk.mixins import AuthMixin, InteractiveMixin
from sys import version_info
VERSION = '2.0.2' VERSION = '2.0.2'
if version_info.major >= 2 and version_info.minor >= 7: # http://xbmc.ru/forum/showpost.php?p=107619&postcount=20
logging.config.dictConfig(LOGGING_CONFIG) logging.config.dictConfig(LOGGING_CONFIG)
logger = logging.getLogger('vk') logger = logging.getLogger('vk')
@ -44,7 +44,7 @@ class Session(object):
def access_token(self, value): def access_token(self, value):
self._access_token = value self._access_token = value
if isinstance(value, str_type) and len(value) >= 12: if isinstance(value, str_type) and len(value) >= 12:
self.censored_access_token = '{}***{}'.format(value[:4], value[-4:]) self.censored_access_token = '{0}***{1}'.format(value[:4], value[-4:]) # http://xbmc.ru/forum/showpost.php?p=107619&postcount=20
else: else:
self.censored_access_token = value self.censored_access_token = value
logger.debug('access_token = %r', self.censored_access_token) logger.debug('access_token = %r', self.censored_access_token)

2
lib/vk/exceptions.py
View File

@ -33,7 +33,7 @@ class VkAPIError(VkException):
@staticmethod @staticmethod
def get_pretty_request_params(error_data): def get_pretty_request_params(error_data):
request_params = error_data.get('request_params', ()) request_params = error_data.get('request_params', ())
request_params = {param['key']: param['value'] for param in request_params} request_params = dict((param['key'], param['value']) for param in request_params) # http://xbmc.ru/forum/showpost.php?p=107615&postcount=16
return request_params return request_params
def is_access_token_incorrect(self): def is_access_token_incorrect(self):