lavatech/rana-cli
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

catch UnicodeDecodeErrors from simplejson.

Browse source
This commit is contained in:
Alan Hamlett 2013-11-21 01:06:50 -08:00
parent 28da601ad3
commit 6c7e722390
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
wakatime/__init__.py
View file

@ -63,6 +63,9 @@ def parseConfigFile(configFile):
'verbose': False, 'verbose': False,
} }
if not os.path.isfile(configFile):
return configs
try: try:
with open(configFile) as fh: with open(configFile) as fh:
for line in fh: for line in fh:

7
wakatime/log.py
View file

@ -25,7 +25,12 @@ class CustomEncoder(json.JSONEncoder):
if isinstance(obj, bytes): if isinstance(obj, bytes):
obj = bytes.decode(obj) obj = bytes.decode(obj)
return json.dumps(obj) return json.dumps(obj)
return super(CustomEncoder, self).default(obj) try:
encoded = super(CustomEncoder, self).default(obj)
except UnicodeDecodeError:
obj = obj.decode('utf-8', 'ignore')
encoded = super(CustomEncoder, self).default(obj)
return encoded
class JsonFormatter(logging.Formatter): class JsonFormatter(logging.Formatter):