summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/util/keyring_helpers.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-25 21:32:54 -0400
committerKali Kaneko <kali@leap.se>2016-04-25 21:32:54 -0400
commit434d0534661d7c222e5dabc4e5e237b060d2212b (patch)
tree2e7bf0e556f983bd5404481a9aa4fb0fd7d75778 /src/leap/bitmask/util/keyring_helpers.py
parent9ee728108f3b894d097206cc6ff6d0a70808f2d5 (diff)
parentf47416804ad2f88ba27aa032e0d2fc1c9fd314c8 (diff)
Merge branch 'develop' into debian/experimental
Diffstat (limited to 'src/leap/bitmask/util/keyring_helpers.py')
-rw-r--r--src/leap/bitmask/util/keyring_helpers.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/leap/bitmask/util/keyring_helpers.py b/src/leap/bitmask/util/keyring_helpers.py
index d81f39b1..c5181348 100644
--- a/src/leap/bitmask/util/keyring_helpers.py
+++ b/src/leap/bitmask/util/keyring_helpers.py
@@ -24,8 +24,9 @@ try:
EncryptedKeyring,
PlaintextKeyring
]
- canuse = lambda kr: (kr is not None
- and kr.__class__ not in OBSOLETE_KEYRINGS)
+ canuse = lambda kr: (
+ kr is not None and
+ kr.__class__ not in OBSOLETE_KEYRINGS)
except Exception:
# Problems when importing keyring! It might be a problem binding to the