1 files changed, 17 insertions, 9 deletions

diff --git a/src/mailman_pgp/testing/pgp.py b/src/mailman_pgp/testing/pgp.py
index 15723bc..89f7a98 100644
--- a/src/mailman_pgp/testing/pgp.py
+++ b/src/mailman_pgp/testing/pgp.py
@@ -30,23 +30,31 @@ from mailman_pgp.testing.layers import PGPLayer
 from mailman_pgp.utils.pgp import revoc_from_blob
 
 
+def load_blob(*path):
+    return resource_string('mailman_pgp.pgp.tests',
+                           os.path.join('data', *path))
+
+
 def load_message(path):
-    data = resource_string('mailman_pgp.pgp.tests',
-                           os.path.join('data', 'messages', path))
-    return message_from_bytes(data, Message)
+    """
+    :rtype: Message
+    """
+    return message_from_bytes(load_blob('messages', path), Message)
 
 
 def load_key(path):
-    key, _ = PGPKey.from_blob(
-            resource_string('mailman_pgp.pgp.tests',
-                            os.path.join('data', 'keys', path)))
+    """
+    :rtype: pgpy.PGPKey
+    """
+    key, _ = PGPKey.from_blob(load_blob('keys', path))
     return key
 
 
 def load_revoc(path):
-    return revoc_from_blob(resource_string('mailman_pgp.pgp.tests',
-                                           os.path.join('data', 'revocs',
-                                                        path)))
+    """
+    :rtype: pgpy.PGPSignature
+    """
+    return revoc_from_blob(load_blob('revocs', path))
 
 
 def payload_equal(one_msg, other_msg):