Skip to content

Commit

Permalink
Merge pull request #23 from dvdkon/master
Browse files Browse the repository at this point in the history
Fix crash caused by mixup of bytes and str
  • Loading branch information
natevw authored Jun 13, 2017
2 parents 29f4002 + c150b39 commit c8afeaa
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pipeline_browserify/compiler.py
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

0 comments on commit c8afeaa

Please sign in to comment.