Skip to content
This repository has been archived by the owner on Feb 3, 2024. It is now read-only.

Fix for working with python3 (ST3) #216

Closed
wants to merge 4 commits into from
Closed

Fix for working with python3 (ST3) #216

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cba78a2
Fix for python3 (ST3)
vigsterkr Mar 7, 2013
82891d4
Use helper encode/decode functions. #216
quarnster Mar 8, 2013
ea9de0a
Forgot to actually import the s versions of encode/decode. #216
quarnster Mar 8, 2013
01e8019
Merge branch 'master' of github.com:vigsterkr/SublimeClang
vigsterkr Mar 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions internals/translationunitcache.py
View file
Open in desktop
Expand Up @@ -26,7 +26,8 @@


from .common import Worker, complete_path, expand_path, get_setting, get_path_setting,\ from .common import Worker, complete_path, expand_path, get_setting, get_path_setting,\
get_language, LockedVariable, run_in_main_thread, error_message,\ get_language, LockedVariable, run_in_main_thread, error_message,\
display_user_selection, get_cpu_count, status_message, bencode, bdecode, are_we_there_yet display_user_selection, get_cpu_count, status_message, bencode, bdecode,\
sencode, sdecode, are_we_there_yet
from .clang import cindex from .clang import cindex
from .parsehelp.parsehelp import * from .parsehelp.parsehelp import *


Expand Down Expand Up @@ -1251,14 +1252,14 @@ def get_translation_unit(self, filename, opts=[], opts_script=None, unsaved_file


if opts_script: if opts_script:
# shlex.split barfs if fed with an unicode strings # shlex.split barfs if fed with an unicode strings
args = shlex.split(opts_script.encode()) + [filename] args = shlex.split(sencode(opts_script)) + [filename]
process = subprocess.Popen(args, stderr=subprocess.PIPE, stdout=subprocess.PIPE) process = subprocess.Popen(args, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
output = process.communicate() output = process.communicate()
if process.returncode: if process.returncode:
print("The options_script failed with code [%s]" % process.returncode) print("The options_script failed with code [%s]" % process.returncode)
print(output[1]) print(output[1])
else: else:
opts += shlex.split(output[0]) opts += shlex.split(bdecode(output[0]))


if self.debug_options: if self.debug_options:
print("Will compile file %s with the following options:\n%s" % (filename, opts)) print("Will compile file %s with the following options:\n%s" % (filename, opts))
Expand Down