Merge lp:~brian-murray/ubuntu-archive-tools/phased-updater-codecs into lp:ubuntu-archive-tools

[Brian Murray]

Use codecs.open() to write the NOTIFICATIONS file so that we can handle packages changed by people with unicode in their names. Additionally, stop reading the NOTIFICATIONS file with csv.reader since it doesn't handle unicode easily. I also fixed an inconsistency with writing signer.name instead of signer_name to the NOTIFICATIONS file for an increased rate.

[Barry Warsaw (barry)]

LGTM with just a few questions, but nothing that blocks landing.

[Steve Langasek (vorlon)]

See inline comments.

review: Needs Information

[lp:~brian-murray/ubuntu-archive-tools/phased-updater-codecs]

1029. By Brian Murray on 2016-06-08

address reviewer feedback

[Brian Murray (brian-murray)]

Thanks for the feedback, I've made the suggested changes!

=== modified file 'phased-updater'
--- phased-updater	2016-06-07 16:03:17 +0000
+++ phased-updater	2016-06-08 22:16:55 +0000
@@ -27,6 +27,7 @@
 from __future__ import print_function
 
 import apt
+import codecs
 import csv
 import datetime
 import logging
@@ -206,14 +207,14 @@
     from email.mime.text import MIMEText
     notifications = defaultdict(list)
     try:
-        with open(NOTIFICATIONS, 'r') as notify_file:
-            notify_csv = csv.reader(notify_file)
-            for row in notify_csv:
+        with codecs.open(NOTIFICATIONS, 'r', encoding='utf-8') as notify_file:
+            for line in notify_file.readlines():
+                line = line.strip('\n').split(', ')
                 # LP name, problem, pkg_version
-                person = row[0].strip()
-                problem = row[1].strip()
-                pkg = row[2].strip()
-                pkg_version = row[3].strip()
+                person = line[0]
+                problem = line[1]
+                pkg = line[2]
+                pkg_version = line[3]
                 notifications[person].append((problem, pkg, pkg_version))
     except IOError:
         pass
@@ -267,7 +268,7 @@
                 for line in changes_file.readlines():
                     line = line.strip()
                     if line.startswith('Changed-By:'):
-                        changer = line.lstrip('Changed-By: ')
+                        changer = line.lstrip('Changed-By: ').decode('utf-8')
                         signer_name, signer_email = utils.parseaddr(changer.strip())
                         break
                 logging.info("Used changes file to find email for %s %s %s" %
@@ -315,7 +316,7 @@
                 smtp.quit()
                 logging.info('%s mailed about %s' % (receivers, subject))
                 # add signer, problem, pkg, version to notifications csv file
-                with open(NOTIFICATIONS, 'a') as notify_file:
+                with codecs.open(NOTIFICATIONS, 'a', encoding='utf-8') as notify_file:
                     for bucket in spph_buckets[rname][spph]['buckets']:
                         notify_file.write('%s, %s, %s, %s\n' % \
                                           (signer_name, bucket,
@@ -350,9 +351,9 @@
                 logging.info('%s mailed about %s' % (receivers, subject))
                 # add signer, increased-rate, pkg, version to
                 # notifications csv
-                with open(NOTIFICATIONS, 'a') as notify_file:
+                with codecs.open(NOTIFICATIONS, 'a', encoding='utf-8') as notify_file:
                     notify_file.write('%s, increased-rate, %s, %s\n' %
-                                      (signer.name, pkg, version))
+                                      (signer_name, pkg, version))
 
 
 def new_buckets(archive, release, src_pkg, version):