jconfig 2.0 and update vk_api

Author: python273

jconfig/__init__.py

@@ -9,7 +9,7 @@
 """
 
 __author__ = 'Kirill Python'
-__version__ = '1.2'
+__version__ = '2.0'
 __email__ = 'python273@ya.ru'
 __contact__ = 'https://vk.com/python273'
 

jconfig/jconfig.py

@@ -8,40 +8,41 @@
 Copyright (C) 2015
 """
 
-import os
 import json
 
 
 class Config(object):
-    def __init__(self, section, filename=None):
-
-        if not filename:
-            filename = 'config'
-
-        self.section = section  # Секция настроек
-        self.filename = filename  # Файл с настройками
-        self.all = self.parse()  # Все настройки
-        self.settings = self.all.get(section, {})  # Настройки секции
-
-    def __getitem__(self, item):
-        return self.settings.get(item, {})
-
-    def __setitem__(self, key, value):
-        self.settings.update({key: value})
-        self.all.update({self.section: self.settings})
-        self.update(self.all)
-
-    def parse(self):
-        fileis = os.path.exists(self.filename)
-        if fileis:
-            settings = json.load(open(self.filename, 'r'))
-            return settings
-        else:
-            self.update()
-            return {}
-
-    def update(self, settings=None):
-        if not settings:
+    __slots__ = ('_section', '_filename', '_settings')
+
+    def __init__(self, section, filename='.jconfig'):
+        self._section = section
+        self._filename = filename
+        self._settings = self.load()
+
+    def __getattr__(self, name):
+        return self._settings[self._section].get(name)
+
+    def __setattr__(self, name, value):
+        if name.startswith('_'):
+            super(Config, self).__setattr__(name, value)
+            return
+
+        self._settings[self._section][name] = value
+
+    def clear_section(self):
+        self._settings[self._section] = {}
+
+    def load(self):
+        try:
+            with open(self._filename, 'r') as f:
+                settings = json.load(f)
+        except FileNotFoundError:
             settings = {}
 
-        json.dump(settings, open(self.filename, 'w'))
+        settings.setdefault(self._section, {})
+
+        return settings
+
+    def save(self):
+        with open(self._filename, 'w') as f:
+            json.dump(self._settings, f)

vk_api/vk_api.py

@@ -8,11 +8,13 @@
 Copyright (C) 2015
 """
 
-import jconfig
 import re
-import requests
 import time
 
+import requests
+
+import jconfig
+
 DELAY = 0.36  # 3 requests per second
 TOO_MANY_RPS_CODE = 6
 CAPTCHA_ERROR_CODE = 14
@@ -30,7 +32,6 @@
 
 
 class VkApi(object):
-
     def __init__(self, login=None, password=None, number=None, sec_number=None,
                  token=None,
                  proxies=None, captcha_handler=None, config_filename='vk_config.json',
@@ -78,8 +79,8 @@ def __init__(self, login=None, password=None, number=None, sec_number=None,
         self.http = requests.Session()
         self.http.proxies = proxies  # Ставим прокси
         self.http.headers = {  # Притворимся браузером
-            'User-agent': 'Mozilla/5.0 (Windows NT 6.1; rv:38.0) '
-            'Gecko/20100101 Firefox/38.0'
+            'User-agent': 'Mozilla/5.0 (Windows NT 6.1; rv:40.0) '
+            'Gecko/20100101 Firefox/40.0'
         }
 
         self.last_request = 0.0
@@ -90,11 +91,19 @@ def __init__(self, login=None, password=None, number=None, sec_number=None,
             TOO_MANY_RPS_CODE: self.too_many_rps_handler
         }
 
-    def authorization(self):
-        """ Полная авторизация с получением токена """
+    def authorization(self, reauth=False):
+        """ Полная авторизация с получением токена
+
+        :param reauth: Позволяет переавторизиваться, игнорируя сохраненные 
+                        куки и токен
+        """
+
         if self.login and self.password:
-            self.sid = self.settings['remixsid']
-            self.token = self.settings['access_token']
+            if reauth:
+                self.settings.clear_section()
+
+            self.sid = self.settings.remixsid
+            self.token = self.settings.token
 
             if not self.check_sid():
                 self.vk_login()
@@ -136,14 +145,16 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
             remixsid = self.http.cookies['remixsid6']
 
         if remixsid:
-            self.settings['remixsid'] = remixsid
+            self.settings.remixsid = remixsid
 
             # Нужно для авторизации в API
-            self.settings['forapilogin'] = {
+            self.settings.forapilogin = {
                 'p': self.http.cookies['p'],
                 'l': self.http.cookies['l']
             }
 
+            self.settings.save()
+
             self.sid = remixsid
 
         elif 'sid=' in response.url:
@@ -225,8 +236,8 @@ def check_sid(self):
     def api_login(self):
         """ Получение токена через Desktop приложение """
 
-        if not self.sid:
-            raise AuthorizationError('API authorization error (no sid cookie)')
+        if not self.sid or not self.settings.forapilogin:
+            raise AuthorizationError('API authorization error (no cookies)')
 
         url = 'https://oauth.vk.com/authorize'
         values = {
@@ -235,7 +246,7 @@ def api_login(self):
             'response_type': 'token',
         }
 
-        self.http.cookies.update(self.settings['forapilogin'])
+        self.http.cookies.update(self.settings.forapilogin)
         self.http.cookies.update({'remixsid': self.sid})
 
         response = self.http.post(url, values)
@@ -252,7 +263,8 @@ def api_login(self):
                 x = i.split('=')
                 token.update({x[0]: x[1]})
 
-            self.settings['access_token'] = token
+            self.settings.token = token
+            self.settings.save()
             self.token = token
         else:
             raise AuthorizationError('Authorization error (api)')
@@ -355,7 +367,6 @@ def method(self, method, values=None, captcha_sid=None, captcha_key=None):
 
             if error.code in self.error_handlers:
                 if error.code == CAPTCHA_ERROR_CODE:
-
                     error = Captcha(
                         self,
                         error.error['captcha_sid'],
@@ -433,7 +444,6 @@ class AccountBlocked(AuthorizationError):
 
 
 class SecurityCheck(AuthorizationError):
-
     def __init__(self, phone_prefix, phone_postfix, response=None):
         self.phone_prefix = phone_prefix
         self.phone_postfix = phone_postfix
@@ -450,7 +460,6 @@ def __str__(self):
 
 
 class ApiError(Exception):
-
     def __init__(self, vk, method, values, error):
         self.vk = vk
         self.method = method
@@ -471,7 +480,6 @@ def __str__(self):
 
 
 class ApiHttpError(Exception):
-
     def __init__(self, vk, method, values, response):
         self.vk = vk
         self.method = method
@@ -490,7 +498,6 @@ def __str__(self):
 
 
 class Captcha(Exception):
-
     def __init__(self, vk, captcha_sid,
                  func, args=None, kwargs=None, url=None):
         self.vk = vk