Skip to content

Commit ea93754

Browse files
author
Logan Howlett
committed
Merge branch 'release/0.6.1'
2 parents b615fdd + 769f452 commit ea93754

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

CoffeeScript.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def run(cmd, args=[], source="", cwd=None, env=None):
1818
args = [args]
1919
if sys.platform == "win32":
2020
proc = Popen([cmd] + args, env=env, cwd=cwd, stdout=PIPE, stdin=PIPE, stderr=PIPE, shell=True)
21-
stat = proc.communicate(input=source)
21+
stat = proc.communicate(input=source.encode('utf-8'))
2222
else:
2323
if env is None:
2424
env = {"PATH": settings.get('binDir', '/usr/local/bin')}
@@ -30,7 +30,7 @@ def run(cmd, args=[], source="", cwd=None, env=None):
3030
proc = Popen(command, env=env, cwd=cwd, stdout=PIPE, stderr=PIPE)
3131
stat = proc.communicate()
3232
okay = proc.returncode == 0
33-
return {"okay": okay, "out": stat[0], "err": stat[1]}
33+
return {"okay": okay, "out": stat[0].decode('utf-8'), "err": stat[1].decode('utf-8')}
3434

3535

3636
def brew(args, source):
@@ -426,6 +426,7 @@ def run(self, edit):
426426
panel.set_syntax_file('Packages/JavaScript/JavaScript.tmLanguage')
427427
panel.set_read_only(False)
428428
output = panel
429+
# print res["err"]
429430

430431
if res["okay"] is True:
431432
edit = output.begin_edit()
@@ -436,7 +437,7 @@ def run(self, edit):
436437
else:
437438
edit = output.begin_edit()
438439
output.erase(edit, sublime.Region(0, output.size()))
439-
output.insert(edit, 0, res["err"].split("\n")[0])
440+
output.insert(edit, 0, res["err"])
440441
output.end_edit(edit)
441442
output.sel().clear()
442443
output.set_read_only(True)

changelogs/0.6.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
# v0.6 Changelog - 16/Jan/2012
1+
# v0.6.1 16/Jan/2013
2+
- Added utf-8 encode/decode to prevent unicode decode errors, fixed #17
3+
- Corrected years in 0.6 changelog... Should get used to it by now.
4+
- Added error output in panel which fixes #16
5+
6+
# v0.6 Changelog - 16/Jan/2013
27

38
- Changed menu name to "Better Coffeescript"
49
- Changed menu arguments to be directed to `sublime-better-coffeescript` folders, settings files are still kept as `Coffeescript.sublime-settings`

0 commit comments

Comments
 (0)