summaryrefslogtreecommitdiff
path: root/service/pixelated
diff options
context:
space:
mode:
Diffstat (limited to 'service/pixelated')
-rw-r--r--service/pixelated/adapter/services/mail_service.py1
-rw-r--r--service/pixelated/maintenance.py5
-rw-r--r--service/pixelated/resources/mails_resource.py1
3 files changed, 3 insertions, 4 deletions
diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py
index 6ae34472..4623a5eb 100644
--- a/service/pixelated/adapter/services/mail_service.py
+++ b/service/pixelated/adapter/services/mail_service.py
@@ -117,7 +117,6 @@ class MailService(object):
@defer.inlineCallbacks
def delete_mail(self, mail_id):
mail = yield self.mail(mail_id)
- print 'go mail %s' % mail
if mail.mailbox_name.upper() == u'TRASH':
yield self.mail_store.delete_mail(mail_id)
else:
diff --git a/service/pixelated/maintenance.py b/service/pixelated/maintenance.py
index 63a0fa0e..ae320049 100644
--- a/service/pixelated/maintenance.py
+++ b/service/pixelated/maintenance.py
@@ -98,15 +98,16 @@ def add_command_callback(args, prepareDeferred, finalizeDeferred):
return finalizeDeferred
+@defer.inlineCallbacks
def delete_all_mails(args):
leap_session, soledad = args
- generation, docs = soledad.get_all_docs()
+ generation, docs = yield soledad.get_all_docs()
for doc in docs:
if doc.content.get('type', None) in ['head', 'cnt', 'flags']:
soledad.delete_doc(doc)
- return args
+ defer.returnValue(args)
def is_keep_file(mail):
diff --git a/service/pixelated/resources/mails_resource.py b/service/pixelated/resources/mails_resource.py
index 9658bd82..e18fe2c3 100644
--- a/service/pixelated/resources/mails_resource.py
+++ b/service/pixelated/resources/mails_resource.py
@@ -168,7 +168,6 @@ class MailsResource(Resource):
defer_response(self._draft_service.update_draft(draft_id, _mail))
deferred_check.addCallback(return422otherwise)
else:
- print '\nCreating draft\n'
defer_response(self._draft_service.create_draft(_mail))
return server.NOT_DONE_YET