diff options
Diffstat (limited to 'pandora/models/_base.py')
-rw-r--r-- | pandora/models/_base.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pandora/models/_base.py b/pandora/models/_base.py index 6975d0a..8904be1 100644 --- a/pandora/models/_base.py +++ b/pandora/models/_base.py | |||
@@ -71,7 +71,6 @@ class DateField(SyntheticField): | |||
71 | 71 | ||
72 | 72 | ||
73 | class ModelMetaClass(type): | 73 | class ModelMetaClass(type): |
74 | |||
75 | def __new__(cls, name, parents, dct): | 74 | def __new__(cls, name, parents, dct): |
76 | dct["_fields"] = fields = {} | 75 | dct["_fields"] = fields = {} |
77 | new_dct = dct.copy() | 76 | new_dct = dct.copy() |
@@ -159,7 +158,8 @@ class PandoraModel(metaclass=ModelMetaClass): | |||
159 | """ | 158 | """ |
160 | items = [ | 159 | items = [ |
161 | "=".join((key, repr(getattr(self, key)))) | 160 | "=".join((key, repr(getattr(self, key)))) |
162 | for key in sorted(self._fields.keys())] | 161 | for key in sorted(self._fields.keys()) |
162 | ] | ||
163 | 163 | ||
164 | if items: | 164 | if items: |
165 | output = ", ".join(items) | 165 | output = ", ".join(items) |
@@ -167,8 +167,9 @@ class PandoraModel(metaclass=ModelMetaClass): | |||
167 | output = None | 167 | output = None |
168 | 168 | ||
169 | if and_also: | 169 | if and_also: |
170 | return "{}({}, {})".format(self.__class__.__name__, | 170 | return "{}({}, {})".format( |
171 | output, and_also) | 171 | self.__class__.__name__, output, and_also |
172 | ) | ||
172 | else: | 173 | else: |
173 | return "{}({})".format(self.__class__.__name__, output) | 174 | return "{}({})".format(self.__class__.__name__, output) |
174 | 175 | ||
@@ -301,7 +302,8 @@ class PandoraDictListModel(PandoraModel, dict): | |||
301 | 302 | ||
302 | for part in item[self.__list_key__]: | 303 | for part in item[self.__list_key__]: |
303 | self[key].append( | 304 | self[key].append( |
304 | cls.__list_model__.from_json(api_client, part)) | 305 | cls.__list_model__.from_json(api_client, part) |
306 | ) | ||
305 | 307 | ||
306 | return self | 308 | return self |
307 | 309 | ||