Merge ~cjwatson/launchpad:py3-packagebuild-bytesio into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: e24a3a2ebc092cabf8fdcfb6a5012546b742fdd3
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-packagebuild-bytesio
Merge into: launchpad:master
Diff against target: 23 lines (+2/-3)
1 file modified
lib/lp/buildmaster/model/packagebuild.py (+2/-3)
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+389439@code.launchpad.net

Commit message

Convert PackageBuildMixin to BytesIO

To post a comment you must log in.
e24a3a2... by Colin Watson

Convert PackageBuildMixin to BytesIO

Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/buildmaster/model/packagebuild.py b/lib/lp/buildmaster/model/packagebuild.py
2index 9c61291..b4d6070 100644
3--- a/lib/lp/buildmaster/model/packagebuild.py
4+++ b/lib/lp/buildmaster/model/packagebuild.py
5@@ -6,8 +6,7 @@ __all__ = [
6 'PackageBuildMixin',
7 ]
8
9-
10-from cStringIO import StringIO
11+import io
12
13 import six
14 from zope.component import getUtility
15@@ -85,7 +84,7 @@ class PackageBuildMixin(BuildFarmJobMixin):
16 contentType = filenameToContentType(filename)
17 content = six.ensure_binary(content)
18 file_size = len(content)
19- file_content = StringIO(content)
20+ file_content = io.BytesIO(content)
21 restricted = self.is_private
22
23 return getUtility(ILibraryFileAliasSet).create(

Subscribers

People subscribed via source and target branches

to status/vote changes: