diff options
| author | Duda Dornelles <ddornell@thoughtworks.com> | 2014-11-18 11:52:09 -0200 |
|---|---|---|
| committer | Duda Dornelles <ddornell@thoughtworks.com> | 2014-11-18 12:28:35 -0200 |
| commit | c0b7c92b41eb7118a349cc91990d201d22816cad (patch) | |
| tree | 6bc0157a4bc615cfcc20fa137ba5aa8adf361953 /service/pixelated/adapter | |
| parent | 500744ee8cabd1bffb61eae8029f2832d6fb2f02 (diff) | |
Deferring TagsController.tags and fixing tests to deal with deferreds
Diffstat (limited to 'service/pixelated/adapter')
| -rw-r--r-- | service/pixelated/adapter/search.py | 2 | ||||
| -rw-r--r-- | service/pixelated/adapter/soledad_querier.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/service/pixelated/adapter/search.py b/service/pixelated/adapter/search.py index cd900f87..6c62ccc3 100644 --- a/service/pixelated/adapter/search.py +++ b/service/pixelated/adapter/search.py @@ -102,7 +102,7 @@ class SearchEngine(object): raw=TEXT(stored=False)) def _create_index(self): - masterkey = self.soledad_querier.get_index_masterkey + masterkey = self.soledad_querier.get_index_masterkey() storage = EncryptedFileStorage(self.INDEX_FOLDER, masterkey) return FileIndex.create(storage, self._mail_schema(), indexname='mails') diff --git a/service/pixelated/adapter/soledad_querier.py b/service/pixelated/adapter/soledad_querier.py index 2e67a5ab..a11ff7a3 100644 --- a/service/pixelated/adapter/soledad_querier.py +++ b/service/pixelated/adapter/soledad_querier.py @@ -26,7 +26,6 @@ class SoledadQuerier: def __init__(self, soledad): self.soledad = soledad - @property def get_index_masterkey(self): index_key = self.soledad.get_from_index('by-type', 'index_key') if len(index_key) == 0: |