summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorDuda Dornelles <ddornell@thoughtworks.com>2015-02-13 16:58:22 -0200
committerDuda Dornelles <ddornell@thoughtworks.com>2015-02-13 17:53:32 -0200
commit396a0ecef3d69cd342dc60f58cc2ba4e9f5c4600 (patch)
tree68b1cd69a47b83ee76dd8f0a9e9e101b815ec32e /service
parentdaa662d21f2beedce77f49e59e2314fabe5e300d (diff)
Fixing colors for recipient information and fixing pep8 violations
Diffstat (limited to 'service')
-rw-r--r--service/pixelated/adapter/model/mail.py2
-rw-r--r--service/test/unit/resources/__init__.py1
-rw-r--r--service/test/unit/resources/test_keys_resources.py1
3 files changed, 1 insertions, 3 deletions
diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py
index cf665c9e..b2b0986a 100644
--- a/service/pixelated/adapter/model/mail.py
+++ b/service/pixelated/adapter/model/mail.py
@@ -378,7 +378,7 @@ class PixelatedMail(Mail):
@property
def encrypted(self):
return self.hdoc.content["headers"].get("OpenPGP", None) is not None or \
- self.hdoc.content["headers"].get("X-Pixelated-encryption-status", "false") == "true"
+ self.hdoc.content["headers"].get("X-Pixelated-encryption-status", "false") == "true"
def as_dict(self):
dict_mail = {'header': {k.lower(): v for k, v in self.headers.items()},
diff --git a/service/test/unit/resources/__init__.py b/service/test/unit/resources/__init__.py
index b8214a8c..5abd502b 100644
--- a/service/test/unit/resources/__init__.py
+++ b/service/test/unit/resources/__init__.py
@@ -20,4 +20,3 @@ def resolve_result(request, result):
class DummySite(Site):
def get(self, request):
return resolve_result(request, self.getResourceFor(request).render(request))
-
diff --git a/service/test/unit/resources/test_keys_resources.py b/service/test/unit/resources/test_keys_resources.py
index 7113889e..fb085cad 100644
--- a/service/test/unit/resources/test_keys_resources.py
+++ b/service/test/unit/resources/test_keys_resources.py
@@ -56,4 +56,3 @@ class TestKeysResource(unittest.TestCase):
d.addCallback(assert_response)
return d
-