launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

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

Commit message:
Port TestCodeImportJobWorkflowFinishJob to io.BytesIO

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

diff --git a/lib/lp/code/model/tests/test_codeimportjob.py b/lib/lp/code/model/tests/test_codeimportjob.py
index 14ea8f2..a19cace 100644
--- a/lib/lp/code/model/tests/test_codeimportjob.py
+++ b/lib/lp/code/model/tests/test_codeimportjob.py
@@ -12,7 +12,7 @@ __all__ = [
     ]
 
 from datetime import datetime
-import StringIO
+import io
 
 from pymacaroons import Macaroon
 from pytz import UTC
@@ -1067,10 +1067,10 @@ class TestCodeImportJobWorkflowFinishJob(TestCaseWithFactory,
 
         job = self.makeRunningJob()
 
-        log_data = 'several\nlines\nof\nlog data'
+        log_data = b'several\nlines\nof\nlog data'
         log_alias_id = getUtility(ILibrarianClient).addFile(
            'import_log.txt', len(log_data),
-           StringIO.StringIO(log_data), 'text/plain')
+           io.BytesIO(log_data), 'text/plain')
         transaction.commit()
         log_alias = getUtility(ILibraryFileAliasSet)[log_alias_id]
         result = self.getResultForJob(job, log_alias=log_alias)