summaryrefslogtreecommitdiff
path: root/client/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-08-03 14:23:22 -0400
committerKali Kaneko <kali@leap.se>2015-08-03 14:23:22 -0400
commite6c89cab3d0660756524d3fe631d4b1f96834b54 (patch)
tree51c597da8159663d5b7e86c917b40931b3be6abf /client/src
parent351d393b6e2c98c5573d8afa26f5f4b346cac554 (diff)
parent54afb28b372118b0f08d0567b27034dd72fe63e7 (diff)
Merge remote-tracking branch 'leapcode/pr/237' into develop
Diffstat (limited to 'client/src')
-rw-r--r--client/src/leap/soledad/client/api.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py
index def2841a..a3dfb1d4 100644
--- a/client/src/leap/soledad/client/api.py
+++ b/client/src/leap/soledad/client/api.py
@@ -213,8 +213,7 @@ class Soledad(object):
soledad_assert_type(self._passphrase, unicode)
def initialize(attr, val):
- return (getattr(self, attr, None) is None
- and setattr(self, attr, val))
+ return (getattr(self, attr, None) is None and setattr(self, attr, val))
initialize("_secrets_path", os.path.join(
self.default_prefix, self.secrets_file_name))