Update jconfig

Author: python273

jconfig/base.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+"""
+@author: python273
+@contact: https://vk.com/python273
+@license Apache License, Version 2.0, see LICENSE file
+
+Copyright (C) 2017
+"""
+
+
+class BaseConfig(object):
+
+    __slots__ = ('section_name', '_settings', '_section')
+
+    def __init__(self, section, **kwargs):
+        self.section_name = section
+
+        self._settings = self.load(**kwargs)
+        self._section = self._settings.setdefault(section, {})
+
+    def __getattr__(self, name):
+        return self._section.get(name)
+
+    __getitem__ = __getattr__
+
+    def __setattr__(self, name, value):
+        if name in self.__slots__:
+            return super(BaseConfig, self).__setattr__(name, value)
+
+        self._section[name] = value
+
+    __setitem__ = __setattr__
+
+    def setdefault(self, k, d=None):
+        return self._section.setdefault(k, d)
+
+    def clear_section(self):
+        self._section.clear()
+
+    def load(self, **kwargs):
+        raise NotImplementedError
+
+    def save(self):
+        raise NotImplementedError

jconfig/jconfig.py

@@ -9,42 +9,26 @@
 
 import json
 
+from .base import BaseConfig
 
-class Config(object):
-    __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 __getitem__(self, key):
-        return self.__getattr__(key)
+class Config(BaseConfig):
 
-    def __setattr__(self, name, value):
-        if name.startswith('_'):
-            super(Config, self).__setattr__(name, value)
-            return
+    __slots__ = BaseConfig.__slots__ + ('_filename',)
 
-        self._settings[self._section][name] = value
-
-    def __setitem__(self, key, value):
-        return self.__setattr__(key, value)
+    def __init__(self, section, filename='.jconfig'):
+        self._filename = filename
 
-    def clear_section(self):
-        self._settings[self._section] = {}
+        super(Config, self).__init__(section, filename=filename)
 
-    def load(self):
+    def load(self, filename, **kwargs):
         try:
-            with open(self._filename, 'r') as f:
+            with open(filename, 'r') as f:
                 settings = json.load(f)
         except (IOError, ValueError):
             settings = {}
 
-        settings.setdefault(self._section, {})
+        settings.setdefault(self.section_name, {})
 
         return settings
 

jconfig/memory.py

@@ -7,38 +7,12 @@
 Copyright (C) 2017
 """
 
+from .base import BaseConfig
 
-class MemoryConfig(object):
 
-    __slots__ = ('_section', '_settings')
-
-    def __init__(self, section, filename=None, settings=None):
-        self._section = section
-
-        if settings is not None:
-            self._settings = settings
-        else:
-            self._settings = {}
-
-        self._settings.setdefault(section, {})
-
-    def __getattr__(self, name):
-        return self._settings[self._section].get(name)
-
-    def __getitem__(self, key):
-        return self.__getattr__(key)
-
-    def __setattr__(self, name, value):
-        if name.startswith('_'):
-            return super(MemoryConfig, self).__setattr__(name, value)
-
-        self._settings[self._section][name] = value
-
-    def __setitem__(self, key, value):
-        return self.__setattr__(key, value)
-
-    def clear_section(self):
-        self._settings[self._section] = {}
+class MemoryConfig(BaseConfig):
+    def load(self, settings=None, **kwargs):
+        return {} if settings is None else settings
 
     def save(self):
         pass