equal
deleted
inserted
replaced
20 Melange Datastore Models. |
20 Melange Datastore Models. |
21 """ |
21 """ |
22 |
22 |
23 __authors__ = [ |
23 __authors__ = [ |
24 '"Todd Larsen" <tlarsen@google.com>', |
24 '"Todd Larsen" <tlarsen@google.com>', |
|
25 '"Lennard de Rijk" <ljvderijk@gmail.com>', |
25 ] |
26 ] |
26 |
27 |
27 |
28 |
28 from google.appengine.ext import db |
29 from google.appengine.ext import db |
29 |
30 |
66 for key in field_names: |
67 for key in field_names: |
67 # Skip everything that is not valid |
68 # Skip everything that is not valid |
68 if not hasattr(self, key): |
69 if not hasattr(self, key): |
69 continue |
70 continue |
70 |
71 |
71 result[key] = getattr(self, key) |
72 value = getattr(self, key) |
72 |
73 |
73 if hasattr(self, 'name'): |
74 if callable(value): |
74 name_prop = getattr(self, 'name') |
75 value = value() |
75 if callable(name_prop): |
76 |
76 result['name'] = name_prop() |
77 result[key] = value |
77 |
78 |
78 return result |
79 return result |
79 |
80 |
80 @classmethod |
81 @classmethod |
81 def fields(cls): |
82 def fields(cls): |