Rev 191: Renamed pqm.script.read_email to pqm.script.read_email_from_file. in http://bzr.daniel-watkins.co.uk/pqm/xmlrpc

[Daniel Watkins]

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

------------------------------------------------------------
revno: 191
revision-id: daniel at daniel-watkins.co.uk-20080731061716-rvw9kvoc2t8kjuu1
parent: daniel at daniel-watkins.co.uk-20080731061434-1asx9espfcmndnud
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: xmlrpc
timestamp: Thu 2008-07-31 07:17:16 +0100
message:
  Renamed pqm.script.read_email to pqm.script.read_email_from_file.
-------------- next part --------------
=== modified file 'bin/pqm'
--- a/bin/pqm	2008-07-31 06:14:34 +0000
+++ b/bin/pqm	2008-07-31 06:17:16 +0000
@@ -104,7 +104,8 @@
         try:
             logger.info('trying script ' + script.filename)
             logname = os.path.join(logdir, os.path.basename(script.filename) + '.log')
-            (sender, subject, msg, sig) = read_email(logger, open(script.filename))
+            (sender, subject, msg, sig) = \
+                read_email_from_file(logger, open(script.filename))
             if options.verify_sigs:
                 sigid,siguid = verify_sig(
                     script.getSender(), msg, sig, 0, logger, options.keyring)
@@ -203,7 +204,7 @@
 def do_read_mode(logger, options):
     sender = None
     try:
-        email = read_email(logger)
+        email = read_email_from_file(logger, sys.stdin)
         email_string = get_email_string(logger, options, email)
         fname = 'patch.%d' % (time.time())
         logger.info('new patch ' + fname)

=== modified file 'pqm/script.py'
--- a/pqm/script.py	2008-07-31 06:09:50 +0000
+++ b/pqm/script.py	2008-07-31 06:17:16 +0000
@@ -69,7 +69,7 @@
         return (sender, subject, msg.get_payload(), None)
 
 
-def read_email(logger, file=None):
+def read_email_from_file(logger, file=None):
     if not file:
         file = sys.stdin
     msg = email.message_from_file(file)
@@ -130,7 +130,7 @@
         #  something I plan on breaking in an ad hoc manner right now. The
         #  read_email and email.message_from_file and verify_sig functions
         #  need rearranging and consolidating to allow this.
-        details = read_email(self.logger, open(self.filename))
+        details = read_email_from_file(self.logger, open(self.filename))
         (self.sender, self.subject, self.msg, self.sig) = details
         self.signing_email = None
         if self.verify_sigs: