Rev 186: Further decoupling. in http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

------------------------------------------------------------
revno: 186
revision-id: daniel at daniel-watkins.co.uk-20080731052622-2d52xs5btmr1jgnz
parent: daniel at daniel-watkins.co.uk-20080731052236-hb54tzzzz2qvilbf
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: xmlrpc
timestamp: Thu 2008-07-31 06:26:22 +0100
message:
  Further decoupling.
-------------- next part --------------
=== modified file 'bin/pqm'
--- a/bin/pqm	2008-07-31 04:51:39 +0000
+++ b/bin/pqm	2008-07-31 05:26:22 +0000
@@ -206,7 +206,8 @@
         fname = 'patch.%d' % (time.time())
         logger.info('new patch ' + fname)
         f = open('tmp.' + fname, 'w')
-        f.write(get_email_string(logger, options))
+        email = read_email(logger)
+        f.write(get_email_string(logger, options, email))
         f.close()
         os.rename('tmp.' + fname, fname)
     except:

=== modified file 'pqm/script.py'
--- a/pqm/script.py	2008-07-31 05:22:36 +0000
+++ b/pqm/script.py	2008-07-31 05:26:22 +0000
@@ -76,8 +76,13 @@
     return get_email_structure(logger, msg)
 
 
-def get_email_string(logger, options, file=None):
-    (sender, subject, msg, sig) = read_email(logger, file)
+def read_email_from_string(logger, string):
+    msg = email.message_from_string(string)
+    return get_email_structure(logger, msg)
+
+
+def get_email_string(logger, options, email):
+    (sender, subject, msg, sig) = email
     if options.verify_sigs:
         sigid, siguid = verify_sig(sender, msg, sig, 1, logger,
                                    options.keyring)