# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1428339950 -7200
# Node ID 0681f1824c11e7967d7b071e2c2871f362bc38d9
# Parent  76ce54fdaa5c97117934041df38f1311565d96d9
Added separate text-based GPG methods.

diff -r 76ce54fdaa5c -r 0681f1824c11 GPGUtils.py
--- a/GPGUtils.py	Mon Apr 06 17:23:49 2015 +0200
+++ b/GPGUtils.py	Mon Apr 06 19:05:50 2015 +0200
@@ -151,6 +151,12 @@
         fingerprint, identity = self.verifyMessageText(signature.get_payload(decode=True), as_string(content))
         return fingerprint, identity, content
 
+    def signMessageText(self, text, keyid):
+
+        "Return a signature for 'text' using the given 'keyid'."
+
+        return self.run(["--armor", "-u", keyid, "--detach-sig"], text)
+
     def signMessage(self, message, keyid):
 
         """
@@ -159,7 +165,8 @@
 
         # Sign the container's representation.
 
-        signature = self.run(["--armor", "-u", keyid, "--detach-sig"], as_string(message))
+        text = as_string(message)
+        signature = self.signMessageText(text, keyid)
 
         # Make the container for the message.
 
@@ -172,11 +179,11 @@
 
         return signed_message
 
-    def decryptMessageText(self, message):
+    def decryptMessageText(self, text):
 
-        "Return a decrypted version of 'message'."
+        "Return a decrypted version of 'text'."
 
-        return self.run(["--decrypt"], message)
+        return self.run(["--decrypt"], text)
 
     def decryptMessage(self, message):
 
@@ -198,6 +205,12 @@
 
         return self.decryptMessageText(content.get_payload(decode=True))
 
+    def encryptMessageText(self, text, keyid):
+
+        "Return an encrypted version of 'text' using the given 'keyid'."
+
+        return self.run(["--armor", "-r", keyid, "--encrypt", "--trust-model", "always"], text)
+
     def encryptMessage(self, message, keyid):
 
         """
@@ -205,7 +218,7 @@
         """
 
         text = as_string(message)
-        encrypted = self.run(["--armor", "-r", keyid, "--encrypt", "--trust-model", "always"], text)
+        encrypted = self.encryptMessageText(text, keyid)
 
         # Make the container for the message.