Skip to content

Commit 978f402

Browse files
committed
Issue #8: DomainModel.__data__ attribute has been removed in favor of DomainModel.get_data() method.
1 parent b03e6fa commit 978f402

File tree

2 files changed

+0
-49
lines changed

2 files changed

+0
-49
lines changed

domain_models/models.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,6 @@ def __str__(self):
180180
str(field.get_value(self))))
181181
for field in self.__class__.__view_key__))
182182

183-
@property
184-
def __data__(self):
185-
"""Read only dictionary of model fields/values."""
186-
return dict((name, field.get_value(self))
187-
for name, field in
188-
six.iteritems(self.__class__.__fields__))
189-
190183
def get(self, field_name, default=None):
191184
"""Return the value of the field.
192185

tests/test_models.py

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -57,48 +57,6 @@ class User(models.DomainModel):
5757
self.assertEqual(user2.gender, 'female')
5858
self.assertEqual(user2.birth_date, '05/04/1985')
5959

60-
def test_data_attr(self):
61-
"""Test model's __data__ attribute."""
62-
63-
class User(models.DomainModel):
64-
"""Test user domain model."""
65-
66-
id = fields.Int()
67-
email = fields.String()
68-
first_name = fields.String()
69-
last_name = fields.String()
70-
gender = fields.String()
71-
birth_date = fields.String()
72-
73-
user1 = User()
74-
user1.id = 1
75-
user1.email = 'example1@example.com'
76-
user1.first_name = 'John'
77-
user1.last_name = 'Smith'
78-
user1.gender = 'male'
79-
user1.birth_date = '05/04/1988'
80-
81-
user2 = User()
82-
user2.id = 2
83-
user2.email = 'example2@example.com'
84-
user2.first_name = 'Jane'
85-
user2.last_name = 'Smith'
86-
user2.gender = 'female'
87-
user2.birth_date = '05/04/1985'
88-
89-
self.assertEquals(user1.__data__, dict(id=1,
90-
email='example1@example.com',
91-
first_name='John',
92-
last_name='Smith',
93-
gender='male',
94-
birth_date='05/04/1988'))
95-
self.assertEquals(user2.__data__, dict(id=2,
96-
email='example2@example.com',
97-
first_name='Jane',
98-
last_name='Smith',
99-
gender='female',
100-
birth_date='05/04/1985'))
101-
10260
def test_not_valid_unique_key_field(self):
10361
"""Test that error is raised when unique key is not correct."""
10462
with self.assertRaises(errors.Error):

0 commit comments

Comments
 (0)