From fc6640807c8ddcc2bdb7fab7c10e40c2e44add0b Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 25 Jul 2013 11:18:01 +1200 Subject: [PATCH] i hate expensive properties --- objrepo/record/models.py | 5 ++--- objrepo/record/tests.py | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/objrepo/record/models.py b/objrepo/record/models.py index a584a59..0457ca4 100644 --- a/objrepo/record/models.py +++ b/objrepo/record/models.py @@ -5,15 +5,14 @@ class Record(models.Model): metadata = JSONField(blank=True) title = models.TextField() - @property def all_metadata(self): result = {} for l in self.out_links.filter(inherit=True): if l.prefix is None: - result.update(l.link_to.all_metadata) + result.update(l.link_to.all_metadata()) else: - for k,v in l.link_to.all_metadata.iteritems(): + for k,v in l.link_to.all_metadata().iteritems(): result[l.prefix + ':' + k] = v result.update(self.metadata) diff --git a/objrepo/record/tests.py b/objrepo/record/tests.py index ba42e9a..330a15c 100644 --- a/objrepo/record/tests.py +++ b/objrepo/record/tests.py @@ -22,7 +22,7 @@ class RecordTests(TestCase): }) def test_metadata_one_record(self): - d = self.r.all_metadata + d = self.r.all_metadata() self.assertEqual(d['ex:llama_id'], 42) def test_metadata_noinherit(self): @@ -33,7 +33,7 @@ class RecordTests(TestCase): label='ex:related_to', inherit=False) - d = self.r.all_metadata + d = self.r.all_metadata() self.assertEqual(d['ex:llama_id'], 42) self.assertNotIn('ex:another_property', d) @@ -46,7 +46,7 @@ class RecordTests(TestCase): label='ex:related_to', inherit=True) - d = self.r.all_metadata + d = self.r.all_metadata() self.assertEqual(d['ex:llama_id'], 42) self.assertEqual(d['ex:another_property'], 23) @@ -62,7 +62,7 @@ class RecordTests(TestCase): inherit=True, prefix='p') - d = self.r.all_metadata + d = self.r.all_metadata() self.assertEqual(d['ex:llama_id'], 42) self.assertEqual(d['p:ex:another_property'], 23)