Up version. Bad recursion
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "configurator"
|
name = "configurator"
|
||||||
version ="1.1"
|
version ="1.2"
|
||||||
authors = [
|
authors = [
|
||||||
{ name="RemiZOffAlex", email="remizoffalex@gmail.com" },
|
{ name="RemiZOffAlex", email="remizoffalex@gmail.com" },
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -3,14 +3,9 @@ __email__ = 'remizoffalex@mail.ru'
|
|||||||
|
|
||||||
|
|
||||||
class Config:
|
class Config:
|
||||||
def get(self, key):
|
def get(self, key, default=None):
|
||||||
value = self.__value[key]
|
value = self.__value[key]
|
||||||
if isinstance(value, dict):
|
result = value
|
||||||
result = Config(value)
|
|
||||||
elif isinstance(value, list):
|
|
||||||
result = Config(value)
|
|
||||||
else:
|
|
||||||
result = value
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def merge(self, condition, config):
|
def merge(self, condition, config):
|
||||||
@@ -44,23 +39,21 @@ class Config:
|
|||||||
def _getattr(obj, attr):
|
def _getattr(obj, attr):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if key=='items' and isinstance(self.__value, dict):
|
if isinstance(self.__value, dict):
|
||||||
return self.__value.items
|
if key=='items':
|
||||||
|
return self.__value.items
|
||||||
|
if key=='keys':
|
||||||
|
return self.__value.keys
|
||||||
value = self.__value[key]
|
value = self.__value[key]
|
||||||
if isinstance(value, dict | list):
|
if isinstance(value, dict | list):
|
||||||
result = Config(value)
|
result = value
|
||||||
else:
|
else:
|
||||||
result = value
|
result = value
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def __getitem__(self, key):
|
def __getitem__(self, key):
|
||||||
value = self.__value[key]
|
value = self.__value[key]
|
||||||
if isinstance(value, dict):
|
result = value
|
||||||
result = Config(value)
|
|
||||||
elif isinstance(value, list):
|
|
||||||
result = Config(value)
|
|
||||||
else:
|
|
||||||
result = value
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def __iter__(self):
|
def __iter__(self):
|
||||||
|
|||||||
Reference in New Issue
Block a user