Merge branch 'develop' into fix_proxycommand_leaks

aiidateam · Oct 4, 2018 · 613e2a7 · 613e2a7
2 parents 14aff3b + f9a5624
commit 613e2a7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/aiida/utils/serialize.py b/aiida/utils/serialize.py
@@ -48,7 +48,8 @@ def decode_key(key):
     :param key: the key to decode
     :return: the decoded key
     """
-    if key.startswith(_PREFIX_KEY_TUPLE):
+
+    if isinstance(key, six.string_types) and key.startswith(_PREFIX_KEY_TUPLE):
         return literal_eval(key[len(_PREFIX_KEY_TUPLE):])
     else:
         return key