openstack
/
requirements
Code Issues Proposed changes

Merge "fix unicode errors"

This commit is contained in:
Zuul 2018-04-21 05:10:37 +00:00 committed by Gerrit Code Review
parent ca086515d1 fdbe4c1a1d
commit 25e9aadf01
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_requirements/cmds/generate.py
View File

@ -88,10 +88,10 @@ def _freeze(requirements, python):
return (version, _parse_freeze(freeze))
except Exception as exc:
if isinstance(exc, subprocess.CalledProcessError):
output.append(exc.output)
output.append(exc.output.decode('utf-8'))
raise Exception(
"Failed to generate freeze: %s %s"
% ('\n'.join(output), exc))
% ('\n'.join(output).decode('utf-8'), exc))
def _combine_freezes(freezes, blacklist=None):