diff options
| author | Kali Kaneko <kali@futeisha.org> | 2013-09-12 14:04:43 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@futeisha.org> | 2013-09-12 14:04:43 +0200 |
| commit | db996a3e2f18baab07a36bd5d1db4f312bf569e1 (patch) | |
| tree | 9d0affec6d98986e3455d54c27a010e67ccd127e /src/leap/keymanager/openpgp.py | |
| parent | ce411ee35e22a4d17b953ce4f8d22c7b648857c7 (diff) | |
| parent | 53bdad6a6bb43113754f2cdf137abeea27bf8507 (diff) | |
Merge tag '0.3.2' into debian-0.3.2
Tag leap.keymanager version 0.3.2
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.') |