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

upgrade wakatime-cli to v6.0.8

Browse source
This commit is contained in:
Alan Hamlett 2016-09-02 10:50:54 +02:00
parent 21601f9688
commit b4a13a48b9
1305 changed files with 489 additions and 4963 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/wakatime/projects/git.py
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):

4
packages/wakatime/projects/mercurial.py
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):

33
packages/wakatime/projects/projectmap.py
View file

@ -44,20 +44,23 @@ class ProjectMap(BaseProject):
def _find_project(self, path):
path = os.path.realpath(path)
try:
for pattern, new_proj_name in self._configs.items():
try:
compiled = re.compile(pattern, re.IGNORECASE)
match = compiled.search(path)
if match:
for pattern, new_proj_name in self._configs.items():
try:
compiled = re.compile(pattern, re.IGNORECASE)
match = compiled.search(path)
if match:
try:
return new_proj_name.format(*match.groups())
except re.error as ex:
log.warning(u('Regex error ({msg}) for projectmap pattern: {pattern}').format(
msg=u(ex),
pattern=u(pattern),
))
except TypeError:
pass
except IndexError as ex:
log.warning(u('Regex error ({msg}) for projectmap pattern: {pattern}').format(
msg=u(ex),
pattern=u(new_proj_name),
))
except re.error as ex:
log.warning(u('Regex error ({msg}) for projectmap pattern: {pattern}').format(
msg=u(ex),
pattern=u(pattern),
))
return None
@ -65,6 +68,4 @@ class ProjectMap(BaseProject):
return None
def name(self):
if self.project:
return u(self.project)
return None
return u(self.project) if self.project else None

4
packages/wakatime/projects/wakatime_project_file.py
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