Skip to content

Commit 6d2b431

Browse files
hwonyobe-hase
authored andcommitted
modify code lines for as_json_dict method in Base class (#95)
* modify code lines for as_json_dict method in Base class * sub_obj > value & obj > item
1 parent 33a3362 commit 6d2b431

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

linebot/models/base.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,21 @@ def as_json_dict(self):
7878
:return: dict
7979
"""
8080
data = {}
81-
for key in self.__dict__.keys():
81+
for key, value in self.__dict__.items():
8282
camel_key = utils.to_camel_case(key)
83-
if isinstance(getattr(self, key, None), (list, tuple, set)):
83+
if isinstance(value, (list, tuple, set)):
8484
data[camel_key] = list()
85-
for sub_obj in getattr(self, key, None):
86-
if getattr(sub_obj, 'as_json_dict', None):
87-
data[camel_key].append(sub_obj.as_json_dict())
85+
for item in value:
86+
if hasattr(item, 'as_json_dict'):
87+
data[camel_key].append(item.as_json_dict())
8888
else:
89-
data[camel_key].append(sub_obj)
89+
data[camel_key].append(item)
9090

91-
elif getattr(getattr(self, key, None), 'as_json_dict', None):
92-
data[camel_key] = getattr(self, key).as_json_dict()
91+
elif hasattr(value, 'as_json_dict'):
92+
data[camel_key] = value.as_json_dict()
9393

9494
else:
95-
data[camel_key] = getattr(self, key, None)
95+
data[camel_key] = value
9696

9797
return data
9898

0 commit comments

Comments
 (0)