diff options
| author | Kali Kaneko <kali@futeisha.org> | 2013-09-02 00:03:14 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@futeisha.org> | 2013-09-02 00:03:14 +0200 |
| commit | cd5e297c2abdb082c10161f256c286b8216de883 (patch) | |
| tree | d6001b34ad44ec5a365eb36525a89b769620ba7c /src/leap/keymanager/openpgp.py | |
| parent | 5ef6f1ae070ed7e5236aab119d7785f70e54b8e3 (diff) | |
| parent | 97d72aeda6ea094590069ba0d671c00404409d83 (diff) | |
Merge remote-tracking branch 'chiiph/bug/several_fixes' into develop
Diffstat (limited to 'src/leap/keymanager/openpgp.py')
| -rw-r--r-- | src/leap/keymanager/openpgp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py index aa04ed0..7946db8 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.') |