Merge lp:~lifeless/python-oops-tools/fix-reports into lp:python-oops-tools

[Robert Collins]

Fix and test the per-report to address setting.

It was broken, this makes it work. With tests.

[Robert Collins (lifeless)]

Trivial

review: Approve

=== modified file 'src/oopstools/oops/test/report.txt'
--- src/oopstools/oops/test/report.txt	2011-10-13 20:18:51 +0000
+++ src/oopstools/oops/test/report.txt	2012-08-07 04:00:26 +0000
@@ -119,6 +119,7 @@
     >>> from_addr
     'OOPS Summaries <[e-mail]>'
 
+The global default email address was used.
     >>> to_addr
     '[e-mail]'
 
@@ -139,6 +140,11 @@
 
     >>> helpers._today = date(2007, 11, 21)
 
+At the same time, we want to set a custom report address.
+
+    >>> example_report.recipient = "[e-mail]"
+    >>> example_report.save()
+
 Run the script again.
 
     >>> report_mod.main()
@@ -159,12 +165,12 @@
     'OOPS Summaries <[e-mail]>'
 
     >>> to_addr
-    '[e-mail]'
+    '[e-mail]'
 
     >>> message = message_from_string(msg)
 
     >>> message.get('Reply-To')
-    '[e-mail]'
+    '[e-mail]'
 
     >>> message.get('Subject')
     'Example report Errors for 2007-11-20'

=== modified file 'src/oopstools/scripts/report.py'
--- src/oopstools/scripts/report.py	2012-07-27 04:27:53 +0000
+++ src/oopstools/scripts/report.py	2012-08-07 04:00:26 +0000
@@ -42,13 +42,14 @@
     to_addr = report.recipient
     if not to_addr:
         to_addr = settings.REPORT_TO_ADDRESS
+    if type(to_addr) is not str:
+        to_addr = to_addr.encode('utf8')
     msg['Reply-To'] = to_addr
     msg['To'] = to_addr
 
     # Send the email.
     smtp_server.connect()
-    smtp_server.sendmail(
-        from_addr, settings.REPORT_TO_ADDRESS, msg.as_string())
+    smtp_server.sendmail(from_addr, to_addr, msg.as_string())
     smtp_server.quit()