diff options
| author | bors-servo <servo-ops@mozilla.com> | 2021-05-03 00:08:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 00:08:41 -0400 |
| commit | 5245f9ff272586875e1c1b849ae096228ea306a8 (patch) | |
| tree | 4e8b8ee74c0ec6453de96494548eb5b4598dfb1d /python | |
| parent | c289ed5b5e83ad8e80235c148a4600717a37f085 (diff) | |
| parent | a2356ef105cafa2be9ff91bc224e6408ee3f5beb (diff) | |
| download | servo-5245f9ff272586875e1c1b849ae096228ea306a8.tar.gz servo-5245f9ff272586875e1c1b849ae096228ea306a8.zip | |
Auto merge of #28408 - jdm:pyfixes, r=jdm
Python3 fixes
Fixes #28363.
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/command_base.py | 2 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 1a5cc75e746..7b4fd6ab544 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -120,7 +120,7 @@ def archive_deterministically(dir_to_archive, dest_archive, prepend_path=None): arcname = os.path.normpath(os.path.join(prepend_path, arcname)) zip_file.write(entry, arcname=arcname) else: - with gzip.GzipFile('wb', fileobj=out_file, mtime=0) as gzip_file: + with gzip.GzipFile(mode='wb', fileobj=out_file, mtime=0) as gzip_file: with tarfile.open(fileobj=gzip_file, mode='w:') as tar_file: for entry in file_list: arcname = entry diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 40347661761..02c29ba4d23 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -106,7 +106,7 @@ def get_taskcluster_secret(name): def otool(s): o = subprocess.Popen(['/usr/bin/otool', '-L', s], stdout=subprocess.PIPE) - for line in o.stdout: + for line in map(lambda s: s.decode('ascii'), o.stdout): if line[0] == '\t': yield line.split(' ', 1)[0][1:] |