summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2014-11-24 14:53:21 +0100
committerFolker Bernitt <fbernitt@thoughtworks.com>2014-11-24 14:53:21 +0100
commitb2881695a59fa004c9499ebe6b8187e37a5b4bcb (patch)
treed6d10102332c05ef3cbba2406df0904fd7c4ccc7 /service
parent6dcb711dc40bbb36806f29c1ef081a3f0b384283 (diff)
Fixed pep8 warnings.
Diffstat (limited to 'service')
-rw-r--r--service/pixelated/adapter/search.py1
-rw-r--r--service/pixelated/config/routes.py2
-rw-r--r--service/pixelated/controllers/contacts_controller.py2
-rw-r--r--service/test/integration/contacts_test.py2
-rw-r--r--service/test/support/integration/app_test_client.py2
-rw-r--r--service/test/support/integration/soledad_test_base.py2
6 files changed, 5 insertions, 6 deletions
diff --git a/service/pixelated/adapter/search.py b/service/pixelated/adapter/search.py
index fd4e7c36..703f2f51 100644
--- a/service/pixelated/adapter/search.py
+++ b/service/pixelated/adapter/search.py
@@ -198,4 +198,3 @@ class SearchEngine(object):
return flatten([to, cc, bcc])
return []
-
diff --git a/service/pixelated/config/routes.py b/service/pixelated/config/routes.py
index 6bad8a17..334119fc 100644
--- a/service/pixelated/config/routes.py
+++ b/service/pixelated/config/routes.py
@@ -23,4 +23,4 @@ def setup_routes(app, home_controller, mails_controller, tags_controller, featur
# attachments
app.route('/attachment/<attachment_id>', methods=['GET'])(attachments_controller.attachment)
# static
- app.route('/', methods=['GET'], branch=True)(home_controller.home) \ No newline at end of file
+ app.route('/', methods=['GET'], branch=True)(home_controller.home)
diff --git a/service/pixelated/controllers/contacts_controller.py b/service/pixelated/controllers/contacts_controller.py
index f9b0628b..5825b563 100644
--- a/service/pixelated/controllers/contacts_controller.py
+++ b/service/pixelated/controllers/contacts_controller.py
@@ -28,4 +28,4 @@ class ContactsController:
d = deferToThread(lambda: self._search_engine.contacts(query))
d.addCallback(lambda tags: respond_json_deferred(tags, request))
- return d \ No newline at end of file
+ return d
diff --git a/service/test/integration/contacts_test.py b/service/test/integration/contacts_test.py
index b1db485f..40a41e30 100644
--- a/service/test/integration/contacts_test.py
+++ b/service/test/integration/contacts_test.py
@@ -19,4 +19,4 @@ class SearchTest(SoledadTestBase):
self.assertTrue('recipient@cc.com' in contacts)
self.assertTrue('recipient@bcc.com' in contacts)
d.addCallback(_assert)
- return d \ No newline at end of file
+ return d
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index 229d32d6..80baf4c8 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -76,7 +76,7 @@ class AppTestClient:
attachments_controller = AttachmentsController(self.soledad_querier)
setup_routes(self.app, home_controller, mails_controller, tags_controller,
- features_controller, sync_info_controller, attachments_controller, contacts_controller)
+ features_controller, sync_info_controller, attachments_controller, contacts_controller)
def _render(self, request, as_json=True):
def get_request_written_data(_=None):
diff --git a/service/test/support/integration/soledad_test_base.py b/service/test/support/integration/soledad_test_base.py
index a9663144..da9d74dc 100644
--- a/service/test/support/integration/soledad_test_base.py
+++ b/service/test/support/integration/soledad_test_base.py
@@ -84,4 +84,4 @@ class SoledadTestBase(unittest.TestCase):
def get_contacts(self, query):
res, req = self.client.get('/contacts', get_args={'q': query})
- return res \ No newline at end of file
+ return res