improve traceback logging and non-utf8 handling

This commit is contained in:
Alan Hamlett 2016-09-01 11:49:12 +02:00
parent c08288eefd
commit fd322ba3b6
12 changed files with 101 additions and 68 deletions

View file

@ -44,9 +44,9 @@ class Git(BaseProject):
with open(head, 'r', encoding=sys.getfilesystemencoding()) as fh:
return self._get_branch_from_head_file(fh.readline())
except:
log.traceback('warn')
log.traceback(logging.WARNING)
except IOError: # pragma: nocover
log.traceback('warn')
log.traceback(logging.WARNING)
return u('master')
def _project_base(self):

View file

@ -42,9 +42,9 @@ class Mercurial(BaseProject):
with open(branch_file, 'r', encoding=sys.getfilesystemencoding()) as fh:
return u(fh.readline().strip().rsplit('/', 1)[-1])
except:
log.traceback('warn')
log.traceback(logging.WARNING)
except IOError: # pragma: nocover
log.traceback('warn')
log.traceback(logging.WARNING)
return u('default')
def _find_hg_config_dir(self, path):

View file

@ -41,9 +41,9 @@ class WakaTimeProjectFile(BaseProject):
self._project_name = u(fh.readline().strip())
self._project_branch = u(fh.readline().strip())
except:
log.traceback('warn')
log.traceback(logging.WARNING)
except IOError: # pragma: nocover
log.traceback('warn')
log.traceback(logging.WARNING)
return True
return False