launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3-dscfile-bytesio into launchpad:master.

Commit message:
Convert DSCFile to BytesIO

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/389441
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-dscfile-bytesio into launchpad:master.

diff --git a/lib/lp/archiveuploader/dscfile.py b/lib/lp/archiveuploader/dscfile.py
index 4d88239..abd537b 100644
--- a/lib/lp/archiveuploader/dscfile.py
+++ b/lib/lp/archiveuploader/dscfile.py
@@ -18,9 +18,9 @@ __all__ = [
     'SignableTagFile',
     ]
 
-from cStringIO import StringIO
 import errno
 import glob
+from io import BytesIO
 import os
 import shutil
 import tempfile
@@ -676,7 +676,7 @@ class DSCFile(SourceUploadFile, SignableTagFile):
         changelog_lfa = self.librarian.create(
             "changelog",
             len(self.changelog),
-            StringIO(self.changelog),
+            BytesIO(self.changelog),
             "text/x-debian-source-changelog",
             restricted=self.policy.archive.private)
 
@@ -825,7 +825,7 @@ def find_changelog(source_dir, logger):
 
     # Move the changelog file out of the package direcotry
     logger.debug("Found changelog")
-    with open(changelog_file) as changelog:
+    with open(changelog_file, "rb") as changelog:
         return changelog.read()
 
 
diff --git a/lib/lp/archiveuploader/tests/test_nascentuploadfile.py b/lib/lp/archiveuploader/tests/test_nascentuploadfile.py
index 1ad7a81..66770e4 100644
--- a/lib/lp/archiveuploader/tests/test_nascentuploadfile.py
+++ b/lib/lp/archiveuploader/tests/test_nascentuploadfile.py
@@ -272,7 +272,7 @@ class DSCFileTests(PackageUploadFileTestCase):
         uploadfile = self.createDSCFile(
             "foo.dsc", dsc, "main/net", "extra", "dulwich", "0.42",
             self.createChangesFile("foo.changes", changes))
-        uploadfile.changelog = "DUMMY"
+        uploadfile.changelog = b"DUMMY"
         uploadfile.files = []
         release = uploadfile.storeInDatabase(None)
         self.assertEqual("0.42", release.version)
@@ -288,7 +288,7 @@ class DSCFileTests(PackageUploadFileTestCase):
             "foo.dsc", dsc, "main/net", "extra", "dulwich", "0.42",
             self.createChangesFile("foo.changes", changes))
         uploadfile.files = []
-        uploadfile.changelog = "DUMMY"
+        uploadfile.changelog = b"DUMMY"
         release = uploadfile.storeInDatabase(None)
         self.assertEqual("dpkg, bzr", release.builddepends)
 
@@ -300,7 +300,7 @@ class DSCFileTests(PackageUploadFileTestCase):
         uploadfile = self.createDSCFile(
             "foo.dsc", dsc, "main/net", "extra", "dulwich", "0.42",
             self.createChangesFile("foo.changes", changes))
-        uploadfile.changelog = "DUMMY"
+        uploadfile.changelog = b"DUMMY"
         uploadfile.files = []
         release = uploadfile.storeInDatabase(None)
         # DSCFile lowercases the field names
@@ -315,7 +315,7 @@ class DSCFileTests(PackageUploadFileTestCase):
         uploadfile = self.createDSCFile(
             "foo.dsc", dsc, "main/net", "extra", "dulwich", "0.42",
             self.createChangesFile("foo.changes", changes))
-        uploadfile.changelog = "DUMMY"
+        uploadfile.changelog = b"DUMMY"
         uploadfile.files = []
         release = uploadfile.storeInDatabase(None)
         self.assertEqual(u"http://samba.org/~jelmer/bzr";, release.homepage)