Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash caused by mixup of bytes and str #23

Merged
merged 2 commits into from
Jun 13, 2017
Merged

Fix crash caused by mixup of bytes and str #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2b35fb
Fix crash caused by mixup of bytes and str
dvdkon May 24, 2017
c150b39
Add compatibility import for Python 2
dvdkon Jun 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pipeline_browserify/compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import print_function

from pipeline.compilers import SubProcessCompiler
from django.conf import settings
from django.core.exceptions import SuspiciousFileOperation
Expand Down Expand Up @@ -25,7 +27,7 @@ def simple_execute_command(self, cmd, **kwargs):
print(stderr)
if pipe.returncode != 0:
raise CompilerError("Compiler returned non-zero exit status %i" % pipe.returncode, command=cmd, error_output=stderr)
return stdout
return stdout.decode()

def _get_cmd_parts(self):
pipeline_settings = getattr(settings, 'PIPELINE', {})
Expand Down