diff options
| -rw-r--r-- | service/pixelated/config/app_factory.py | 8 | ||||
| -rw-r--r-- | service/pixelated/resources/mails_resource.py | 3 | ||||
| -rw-r--r-- | service/pixelated/resources/root_resource.py | 2 | ||||
| -rw-r--r-- | service/test/integration/retrieve_attachment_test.py | 2 | ||||
| -rw-r--r-- | service/test/support/test_helper.py | 1 |
5 files changed, 2 insertions, 14 deletions
diff --git a/service/pixelated/config/app_factory.py b/service/pixelated/config/app_factory.py index 12830743..9a80640b 100644 --- a/service/pixelated/config/app_factory.py +++ b/service/pixelated/config/app_factory.py @@ -101,14 +101,6 @@ def init_app(app, leap_home): app.resource.initialize(soledad_querier, search_engine, mail_service, draft_service) - # add root to reactor - - # register(signal=proto.SOLEDAD_SYNC_RECEIVE_STATUS, - # callback=update_info_sync_and_index_partial(sync_info_controller=sync_info_controller, - # search_engine=search_engine, - # mail_service=mail_service)) - - register(signal=proto.SOLEDAD_DONE_DATA_SYNC, callback=init_index_and_remove_dupes(querier=soledad_querier, search_engine=search_engine, diff --git a/service/pixelated/resources/mails_resource.py b/service/pixelated/resources/mails_resource.py index d391382d..ccd03ad6 100644 --- a/service/pixelated/resources/mails_resource.py +++ b/service/pixelated/resources/mails_resource.py @@ -123,6 +123,3 @@ class MailsResource(Resource): pixelated_mail = self._draft_service.create_draft(_mail) self._search_engine.index_mail(pixelated_mail) return respond_json({'ident': pixelated_mail.ident}, request) - - - diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py index 326654eb..f230415d 100644 --- a/service/pixelated/resources/root_resource.py +++ b/service/pixelated/resources/root_resource.py @@ -43,4 +43,4 @@ class RootResource(Resource): return static_folder def render_GET(self, request): - return open(os.path.join(self._static_folder, 'index.html')).read()
\ No newline at end of file + return open(os.path.join(self._static_folder, 'index.html')).read() diff --git a/service/test/integration/retrieve_attachment_test.py b/service/test/integration/retrieve_attachment_test.py index 41ffd89d..d6ad9298 100644 --- a/service/test/integration/retrieve_attachment_test.py +++ b/service/test/integration/retrieve_attachment_test.py @@ -41,5 +41,5 @@ class RetrieveAttachmentTest(SoledadTestBase): def _assert(attachment): self.assertEquals('pequeno anexo :D\n', attachment) d.addCallback(_assert) - + return d diff --git a/service/test/support/test_helper.py b/service/test/support/test_helper.py index f43776d1..d2387d0c 100644 --- a/service/test/support/test_helper.py +++ b/service/test/support/test_helper.py @@ -99,4 +99,3 @@ def request_mock(path='', method='GET', body='', headers={}): dummy.method = method dummy.content = io.BytesIO(body) return dummy - |