Merge remote-tracking branch 'meskio/feature/put_key_ascii' into develop

2 files changed, 17 insertions, 3 deletions

diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py
index bd85c2d..da679ac 100644
--- a/src/leap/keymanager/__init__.py
+++ b/src/leap/keymanager/__init__.py
@@ -515,11 +515,14 @@ class KeyManager(object):
         """
         Put C{key} in local storage.
 
-        :param key: The key to be stored.
-        :type key: OpenPGPKey
+        :param key: The key to be stored. It can be ascii key or an OpenPGPKey
+        :type key: str or OpenPGPKey
         """
         try:
-            self._wrapper_map[type(key)].put_key(key)
+            if isinstance(key, basestring):
+                self._wrapper_map[OpenPGPKey].put_ascii_key(key)
+            else:
+                self._wrapper_map[type(key)].put_key(key)
         except IndexError as e:
             leap_assert(False, "Unsupported key type. Error {0!r}".format(e))
 
diff --git a/src/leap/keymanager/tests/test_keymanager.py b/src/leap/keymanager/tests/test_keymanager.py
index 7192bfb..39b729d 100644
--- a/src/leap/keymanager/tests/test_keymanager.py
+++ b/src/leap/keymanager/tests/test_keymanager.py
@@ -466,6 +466,17 @@ class KeyManagerKeyManagementTestCase(KeyManagerWithSoledadTestCase):
         self.assertIsInstance(key, OpenPGPKey)
         self.assertEqual(ADDRESS, key.address)
 
+    def test_put_key_ascii(self):
+        """
+        Test that putting ascii key works
+        """
+        km = self._key_manager(url='http://nickserver.domain')
+
+        km.put_key(PUBLIC_KEY)
+        key = km.get_key(ADDRESS, OpenPGPKey)
+        self.assertIsInstance(key, OpenPGPKey)
+        self.assertEqual(ADDRESS, key.address)
+
 
 class KeyManagerCryptoTestCase(KeyManagerWithSoledadTestCase):