diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-06 15:32:48 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-06 15:32:48 -0300 |
| commit | 54a105c53333a96c2649185823a8473a51f93479 (patch) | |
| tree | 3bc7e855b886d8b0b44bcde4039497bc62ecd018 /src/leap/keymanager/openpgp.py | |
| parent | e1f1f502c724e6229eb81962c15a6b8cb826a2fa (diff) | |
| parent | 53bdad6a6bb43113754f2cdf137abeea27bf8507 (diff) | |
Merge branch 'release-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 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.') |