Merge lp:~james-w/pkgme/unicode-output into lp:pkgme

[James Westby]

Encode unicode before writing it to a file.

Hi,

As spotted by Dave when the package details contain unicode
then we error trying to write the packaging as we don't encode
to utf-8 before writing the files.

This adds a test that demonstrates that and a fix.

I'm not sure that handling str or unicode in that function is the
right thing to do.

Thanks,

James

[Jonathan Lange (jml)]

Thanks! Please make sure there's a card for this on the kanban.

review: Approve

=== modified file 'pkgme/tests/test_write.py'
--- pkgme/tests/test_write.py	2011-07-15 09:22:47 +0000
+++ pkgme/tests/test_write.py	2012-06-19 13:57:54 +0000
@@ -119,3 +119,13 @@
             filename, contents=new_contents, overwrite=False)
         writer.write([package_file], tempdir.path)
         self.assertThat(target_path, FileContains(original_contents))
+
+    def test_write_encodes_unicode(self):
+        writer = self.get_writer()
+        tempdir = self.useFixture(TempdirFixture())
+        contents = u"\x80"
+        filename = self.getUniqueString()
+        target_path = tempdir.abspath(filename)
+        package_file = SimplePackageFile(filename, contents=contents)
+        writer.write([package_file], tempdir.path)
+        self.assertThat(target_path, FileContains(contents.encode('utf-8')))

=== modified file 'pkgme/write.py'
--- pkgme/write.py	2011-07-29 14:07:35 +0000
+++ pkgme/write.py	2012-06-19 13:57:54 +0000
@@ -15,8 +15,11 @@
 
 def write_file(path, content):
     ensure_containing_directory_exists(path)
+    encoded_content = content
+    if isinstance(content, unicode):
+        encoded_content = content.encode('utf-8')
     with open(path, "w") as f:
-        f.write(content)
+        f.write(encoded_content)
 
 
 class Writer(object):