summaryrefslogtreecommitdiff
path: root/src/leap/keymanager/openpgp.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-29 17:41:43 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-30 15:05:38 -0300
commit97d72aeda6ea094590069ba0d671c00404409d83 (patch)
treed6001b34ad44ec5a365eb36525a89b769620ba7c /src/leap/keymanager/openpgp.py
parent5ef6f1ae070ed7e5236aab119d7785f70e54b8e3 (diff)
Do not raise on not 2XX error codes
Also accept unicode ascii keys
Diffstat (limited to 'src/leap/keymanager/openpgp.py')
-rw-r--r--src/leap/keymanager/openpgp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py
index aa04ed09..7946db85 100644
--- a/src/leap/keymanager/openpgp.py
+++ b/src/leap/keymanager/openpgp.py
@@ -301,9 +301,9 @@ class OpenPGPScheme(EncryptionScheme):
Put key contained in ascii-armored C{key_data} in local storage.
:param key_data: The key data to be stored.
- :type key_data: str
+ :type key_data: str or unicode
"""
- leap_assert_type(key_data, str)
+ leap_assert_type(key_data, (str, unicode))
# TODO: add more checks for correct key data.
leap_assert(key_data is not None, 'Data does not represent a key.')