Permalink
Browse files

Merge remote branch 'rs/master'

  • Loading branch information...
2 parents 9287a2c + 09a1f7a commit 27d7d6eca395469ffc1c5737e28664fa61fbfce0 @miracle2k miracle2k committed Nov 8, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/webassets/filter/yui.py
@@ -36,7 +36,7 @@ def setup(self):
def output(self, _in, out, **kw):
proc = subprocess.Popen(
- [self.java, '-jar', self.yui, '--type=%s' % self.mode],
+ [self.java, '-jar', self.yui, '--charset=utf-8', '--type=%s' % self.mode],
# we cannot use the in/out streams directly, as they might be
# StringIO objects (which are not supported by subprocess)
stdout=subprocess.PIPE,

0 comments on commit 27d7d6e

Please sign in to comment.