jyapayne/Electrify
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Fixed some unicode path issues with exporting.

Browse source
This commit is contained in:
Joey Payne 2015-11-25 15:50:45 -07:00
commit af56701b4e
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
command_line.py
View file

@ -83,7 +83,7 @@ handler = lh.RotatingFileHandler(LOG_FILENAME, maxBytes=100000, backupCount=2)
logger.addHandler(handler) logger.addHandler(handler)
def my_excepthook(type_, value, tback): def my_excepthook(type_, value, tback):
output_err = u''.join(traceback.format_exception(type_, value, tback)) output_err = u''.join(unicode(traceback.format_exception(type_, value, tback)))
logger.error(u'{}'.format(output_err)) logger.error(u'{}'.format(output_err))
sys.__excepthook__(type_, value, tback) sys.__excepthook__(type_, value, tback)
@ -421,9 +421,9 @@ class CommandBase(object):
f.write(v+os.linesep) f.write(v+os.linesep)
f.close() f.close()
except IOError: except IOError:
error = u''.join(traceback.format_exception(sys.exc_info()[0], error = u''.join(unicode(traceback.format_exception(sys.exc_info()[0],
sys.exc_info()[1], sys.exc_info()[1],
sys.exc_info()[2])) sys.exc_info()[2])))
self.show_error(error) self.show_error(error)
self.enable_ui_after_error() self.enable_ui_after_error()
finally: finally:
@ -448,9 +448,9 @@ class CommandBase(object):
if os.path.exists(setting.save_file_path(version, location)): if os.path.exists(setting.save_file_path(version, location)):
os.remove(setting.save_file_path(version, location)) os.remove(setting.save_file_path(version, location))
error = u''.join(traceback.format_exception(sys.exc_info()[0], error = u''.join(unicode(traceback.format_exception(sys.exc_info()[0],
sys.exc_info()[1], sys.exc_info()[1],
sys.exc_info()[2])) sys.exc_info()[2])))
self.show_error(error) self.show_error(error)
self.enable_ui_after_error() self.enable_ui_after_error()
@ -790,9 +790,9 @@ class CommandBase(object):
os.remove(nw_path) os.remove(nw_path)
except Exception: except Exception:
exc = traceback.format_exception(sys.exc_info()[0], exc = unicode(traceback.format_exception(sys.exc_info()[0],
sys.exc_info()[1], sys.exc_info()[1],
sys.exc_info()[2]) sys.exc_info()[2]))
self.logger.error(exc) self.logger.error(exc)
self.output_err += u''.join(exc) self.output_err += u''.join(exc)
finally: finally:
@ -1241,7 +1241,7 @@ def main():
logger.addHandler(handler) logger.addHandler(handler)
def my_excepthook(type_, value, tback): def my_excepthook(type_, value, tback):
output_err = u''.join(traceback.format_exception(type_, value, tback)) output_err = u''.join(unicode(traceback.format_exception(type_, value, tback)))
logger.error(u'{}'.format(output_err)) logger.error(u'{}'.format(output_err))
sys.__excepthook__(type_, value, tback) sys.__excepthook__(type_, value, tback)

12
utils.py
View file

@ -19,7 +19,17 @@ def get_temp_dir():
return tempfile.gettempdir() return tempfile.gettempdir()
def path_join(base, *rest): def path_join(base, *rest):
rpath = u'/'.join(rest) try:
base = base.decode('utf-8')
except UnicodeEncodeError:
base = unicode(base)
new_rest = []
for i in xrange(len(rest)):
try:
new_rest.append(rest[i].decode('utf-8'))
except UnicodeEncodeError:
new_rest.append(unicode(rest[i]))
rpath = u'/'.join(new_rest)
if os.path.isabs(rpath): if os.path.isabs(rpath):
return rpath return rpath
else: else: