mirror/sublime-wakatime
1
0
Fork 0
mirror of https://github.com/wakatime/sublime-wakatime.git synced 2023-08-10 21:13:02 +03:00
Code Issues Projects Releases Wiki Activity

decode file names with filesystem encoding, then encode as utf-8 before encoding with simplejson

Browse Source
This commit is contained in:
Alan Hamlett 2013-12-02 09:16:21 +01:00
parent 37f74b4b56
commit 908ff98613
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/wakatime/wakatime-cli.py
View File

@ -1,4 +1,3 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
wakatime-cli wakatime-cli

4
packages/wakatime/wakatime/log.py
View File

@ -11,6 +11,7 @@
import logging import logging
import os import os
import sys
from .packages import simplejson as json from .packages import simplejson as json
try: try:
@ -28,7 +29,8 @@ class CustomEncoder(json.JSONEncoder):
try: try:
encoded = super(CustomEncoder, self).default(obj) encoded = super(CustomEncoder, self).default(obj)
except UnicodeDecodeError: except UnicodeDecodeError:
obj = obj.decode('utf-8', 'ignore') encoding = sys.getfilesystemencoding()
obj = obj.decode(encoding, 'ignore').encode('utf-8')
encoded = super(CustomEncoder, self).default(obj) encoded = super(CustomEncoder, self).default(obj)
return encoded return encoded