diff options
| author | Kali Kaneko <kali@leap.se> | 2016-05-18 12:13:52 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-05-18 12:13:52 -0400 |
| commit | 90aa7a275c41af130dcddaefd798ae35c505b6d5 (patch) | |
| tree | 95441aa18d1022eea56d9348e0c32f392bb674ea /src/leap/bitmask/util | |
| parent | aecb13feed8797acaa3f91be45a82a52b64d4723 (diff) | |
| parent | facefed990195bd89bf1064e75b171edd084f632 (diff) | |
Merge tag '0.9.2'
Tag leap.bitmask version 0.9.2
Diffstat (limited to 'src/leap/bitmask/util')
| -rw-r--r-- | src/leap/bitmask/util/keyring_helpers.py | 5 | ||||
| -rw-r--r-- | src/leap/bitmask/util/pastebin.py | 4 |
2 files changed, 5 insertions, 4 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 diff --git a/src/leap/bitmask/util/pastebin.py b/src/leap/bitmask/util/pastebin.py index 6d50ac9e..b476ad88 100644 --- a/src/leap/bitmask/util/pastebin.py +++ b/src/leap/bitmask/util/pastebin.py @@ -25,13 +25,13 @@ #############################################################################
+import urllib
+
__ALL__ = ['delete_paste', 'user_details', 'trending', 'pastes_by_user',
'generate_user_key', 'paste', 'Pastebin', 'PastebinError',
'PostLimitError']
-import urllib
-
class PastebinError(RuntimeError):
"""Pastebin API error.
|