Skip to content

Commit

Permalink
use non-async getting catalog data for object
Browse files Browse the repository at this point in the history
  • Loading branch information
vangheem committed Apr 10, 2017
1 parent 9893e64 commit 3146509
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions guillotina/catalog/catalog.py
Expand Up @@ -72,11 +72,11 @@ async def remove_catalog(self, container):
"""
pass

async def get_data(self, content):
def get_data(self, content):
data = {}
adapter = queryAdapter(content, ICatalogDataAdapter)
if adapter:
data.update(await adapter())
data.update(adapter())
return data


Expand Down Expand Up @@ -119,7 +119,7 @@ def get_data(self, ob, iface, field_name):
value = getattr(ob, field_name, None)
return json_compatible(value)

async def __call__(self):
def __call__(self):
# For each type
values = {}

Expand All @@ -128,7 +128,7 @@ async def __call__(self):
for index_name, index_data in merged_tagged_value_dict(schema, index.key).items():
try:
if 'accessor' in index_data:
values[index_name] = await apply_coroutine(index_data['accessor'], behavior)
values[index_name] = index_data['accessor'](behavior)
else:
values[index_name] = self.get_data(behavior, schema, index_name)
except NoIndexField:
Expand Down
2 changes: 1 addition & 1 deletion guillotina/db/writer.py
Expand Up @@ -86,4 +86,4 @@ def type(self):
async def get_json(self):
adapter = queryAdapter(self._obj, ICatalogDataAdapter)
if adapter is not None:
return await adapter()
return adapter()
2 changes: 1 addition & 1 deletion guillotina/tests/test_catalog.py
Expand Up @@ -30,7 +30,7 @@ async def test_get_index_data(self, dummy_request):
ob = await create_content('Item', id='foobar')

data = ICatalogDataAdapter(ob)
fields = await data()
fields = data()
assert 'type_name' in fields
assert 'uuid' in fields
assert 'path' in fields
Expand Down

0 comments on commit 3146509

Please sign in to comment.