bugfix
This commit is contained in:
parent
d0b60e772f
commit
fa32e0ac96
@ -15,106 +15,36 @@ def multiDict2Dict(md):
|
|||||||
ns[k] = [ov,v]
|
ns[k] = [ov,v]
|
||||||
return ns
|
return ns
|
||||||
|
|
||||||
class DictObject:
|
class DictObjectEncoder(JSONEncoder):
|
||||||
def __init__(self,**kw):
|
def default(self, o):
|
||||||
self.org_keys__ = []
|
return o._addon()
|
||||||
self.org_keys__ = [ k for k in self.__dict__.keys()]
|
|
||||||
for k,v in kw.items():
|
|
||||||
self.update({k:self.__DOitem(v)})
|
|
||||||
|
|
||||||
def __getattr__(self,name):
|
class DictObject(dict):
|
||||||
if name in self._addon().keys():
|
def __getattr__(self, attr):
|
||||||
return self.__getitem__(name)
|
"""
|
||||||
return None
|
实现点操作符访问字典中的键值对
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
return self.__DOitem(self[attr])
|
||||||
|
except KeyError:
|
||||||
|
return None
|
||||||
|
|
||||||
def update(self,kw):
|
def __setattr__(self, attr, value):
|
||||||
self.__dict__.update(kw)
|
"""
|
||||||
|
实现点操作符设置字典中的键值对
|
||||||
def _addon(self):
|
"""
|
||||||
ks = [ k for k in self.__dict__.keys() if k not in self.org_keys__]
|
self[attr] = value
|
||||||
return {k:v for k,v in self.__dict__.items() if k in ks}
|
|
||||||
|
|
||||||
def clear(self):
|
|
||||||
for k in self._addon().keys():
|
|
||||||
self.__dict__.pop(k)
|
|
||||||
|
|
||||||
def get(self,name,default=None):
|
|
||||||
return self._addon().get(name,default)
|
|
||||||
|
|
||||||
def pop(self,k,default=None):
|
|
||||||
return self.__dict__.pop(k,default)
|
|
||||||
|
|
||||||
def popitem(self):
|
|
||||||
return self.__dict__.popitem()
|
|
||||||
|
|
||||||
def items(self):
|
|
||||||
return self._addon().items()
|
|
||||||
|
|
||||||
def keys(self):
|
|
||||||
return self._addon().keys()
|
|
||||||
|
|
||||||
def values(self):
|
|
||||||
return self._addon().values()
|
|
||||||
|
|
||||||
def __delitem__(self,key):
|
|
||||||
self.pop(key)
|
|
||||||
|
|
||||||
def __getitem__(self,name):
|
|
||||||
return self._addon().get(name)
|
|
||||||
|
|
||||||
def __setitem__(self,name,value):
|
|
||||||
self.__dict__[name] = value
|
|
||||||
|
|
||||||
def __str__(self):
|
|
||||||
return str(self._addon())
|
|
||||||
|
|
||||||
def __expr__(self):
|
|
||||||
return self.addon().__expr__()
|
|
||||||
|
|
||||||
def copy(self):
|
def copy(self):
|
||||||
return {k:v for k,v in self._addon().items()}
|
return self.__DOitem(super().copy())
|
||||||
|
|
||||||
def to_dict(self):
|
|
||||||
d = self._addon()
|
|
||||||
newd = self.dict_to_dict(d)
|
|
||||||
return newd
|
|
||||||
|
|
||||||
def dict_to_dict(self,dic):
|
|
||||||
d = {}
|
|
||||||
for k,v in dic.items():
|
|
||||||
if isinstance(v,DictObject):
|
|
||||||
d[k] = v.to_dict()
|
|
||||||
elif isinstance(v,dict):
|
|
||||||
d[k] = self.dict_to_dict(v)
|
|
||||||
elif isinstance(v,list):
|
|
||||||
d[k] = self.array_to_dict(v)
|
|
||||||
elif k == '__builtins__':
|
|
||||||
pass
|
|
||||||
elif isbuiltin(v) or isfunction(v) or ismethod(v) or isabstract(v):
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
d[k] = v
|
|
||||||
return d
|
|
||||||
|
|
||||||
def array_to_dict(self,v):
|
|
||||||
r = []
|
|
||||||
for i in v:
|
|
||||||
if isinstance(i,list):
|
|
||||||
r.append(self.array_to_dict(i))
|
|
||||||
elif isinstance(i,dict):
|
|
||||||
r.append(self.dict_to_dict(i))
|
|
||||||
elif isinstance(i,DictObject):
|
|
||||||
r.append(i.to_dict())
|
|
||||||
elif isbuiltin(i) or isfunction(i) or ismethod(i) or isabstract(i):
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
r.append(i)
|
|
||||||
return r
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def isMe(self,name):
|
def isMe(self,name):
|
||||||
return name == 'DictObject'
|
return name == 'DictObject'
|
||||||
|
|
||||||
|
def to_dict(self):
|
||||||
|
return self
|
||||||
|
|
||||||
def __DOArray(self,a):
|
def __DOArray(self,a):
|
||||||
b = [ self.__DOitem(i) for i in a ]
|
b = [ self.__DOitem(i) for i in a ]
|
||||||
return b
|
return b
|
||||||
@ -128,18 +58,11 @@ class DictObject:
|
|||||||
d = DictObject(**i)
|
d = DictObject(**i)
|
||||||
return d
|
return d
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print("****************",i,"*******dictObject.py")
|
|
||||||
raise e
|
raise e
|
||||||
if type(i) == type([]) or type(i) == type(()) :
|
if type(i) == type([]) or type(i) == type(()) :
|
||||||
return self.__DOArray(i)
|
return self.__DOArray(i)
|
||||||
return i
|
return i
|
||||||
|
|
||||||
class DictObjectEncoder(JSONEncoder):
|
|
||||||
def default(self, o):
|
|
||||||
return o._addon()
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def dictObjectFactory(_klassName__,**kwargs):
|
def dictObjectFactory(_klassName__,**kwargs):
|
||||||
def findSubclass(_klassName__,klass):
|
def findSubclass(_klassName__,klass):
|
||||||
for k in klass.__subclasses__():
|
for k in klass.__subclasses__():
|
||||||
@ -160,36 +83,3 @@ def dictObjectFactory(_klassName__,**kwargs):
|
|||||||
print("dictObjectFactory()",e,_klassName__)
|
print("dictObjectFactory()",e,_klassName__)
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
class DotDict(dict):
|
|
||||||
def __getattr__(self, attr):
|
|
||||||
"""
|
|
||||||
实现点操作符访问字典中的键值对
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
return self.__DOitem(self[attr])
|
|
||||||
except KeyError:
|
|
||||||
return None
|
|
||||||
|
|
||||||
def __setattr__(self, attr, value):
|
|
||||||
"""
|
|
||||||
实现点操作符设置字典中的键值对
|
|
||||||
"""
|
|
||||||
self[attr] = value
|
|
||||||
|
|
||||||
def __DOArray(self,a):
|
|
||||||
b = [ self.__DOitem(i) for i in a ]
|
|
||||||
return b
|
|
||||||
|
|
||||||
def __DOitem(self, i):
|
|
||||||
if isinstance(i,DotDict):
|
|
||||||
return i
|
|
||||||
if isinstance(i,dict):
|
|
||||||
i = {k:v for k,v in i.items() if isinstance(k,str)}
|
|
||||||
try:
|
|
||||||
d = DotDict(**i)
|
|
||||||
return d
|
|
||||||
except Exception as e:
|
|
||||||
raise e
|
|
||||||
if type(i) == type([]) or type(i) == type(()) :
|
|
||||||
return self.__DOArray(i)
|
|
||||||
return i
|
|
||||||
|
Loading…
Reference in New Issue
Block a user