Merge lp:~bac/launchpad/bug-567985 into lp:launchpad

[Brad Crittenden]

Unbreak ec2test-remote send_mail

= Summary =

Programming error breaks ec2test.

== Proposed fix ==

The variable that holds the data read from a file is used to try to
close the file. Don't do that.

== Pre-implementation notes ==

N/A

== Implementation details ==

As above.

== Tests ==

None, sadly.

== Demo and Q/A ==

Run it through ec2. The actual snippet was tested locally.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/devscripts/ec2test/ec2test-remote.py

== Pyflakes notices ==

lib/devscripts/ec2test/ec2test-remote.py
    35: from __future__ imports must occur at the beginning of the file
    from __future__ import with_statement

== Pylint notices ==

lib/devscripts/ec2test/ec2test-remote.py
    35: [W0410] __future__ import is not the first non docstring statement
    498: [C0321] More than one statement on a single line

[Jonathan Lange (jml)]

Oh man. I'm so sorry I let this happen.

Goes to show that even making minor changes without testing is doomed to failure.

Thanks for the fix!

review: Approve

=== modified file 'lib/devscripts/ec2test/ec2test-remote.py'
--- lib/devscripts/ec2test/ec2test-remote.py	2010-04-21 11:16:21 +0000
+++ lib/devscripts/ec2test/ec2test-remote.py	2010-04-21 17:55:32 +0000
@@ -32,6 +32,8 @@
 
 import subunit
 
+from __future__ import with_statement
+
 
 class SummaryResult(unittest.TestResult):
     """Test result object used to generate the summary."""
@@ -225,10 +227,8 @@
         message['Subject'] = subject
 
         # Make the body.
-        try:
-            summary = open(summary_filename, 'r').read()
-        finally:
-            summary.close()
+        with open(summary_filename, 'r') as summary_fd:
+            summary = summary_fd.read()
         body = MIMEText.MIMEText(summary, 'plain', 'utf8')
         body['Content-Disposition'] = 'inline'
         message.attach(body)