From e8f2d759274e0986d0128ae6bb9d78fe4f0e6bfb Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Mon, 10 Aug 2015 18:32:17 -0700 Subject: [PATCH] use os.path.splitext everywhere --- wakatime/base.py | 7 ++----- wakatime/languages/__init__.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/wakatime/base.py b/wakatime/base.py index 8f09bd9..419bba5 100644 --- a/wakatime/base.py +++ b/wakatime/base.py @@ -320,11 +320,8 @@ def send_heartbeat(project=None, branch=None, hostname=None, stats={}, key=None, 'type': 'file', } if hidefilenames and targetFile is not None and not notfile: - data['entity'] = data['entity'].rsplit('/', 1)[-1].rsplit('\\', 1)[-1] - if len(data['entity'].strip('.').split('.', 1)) > 1: - data['entity'] = u('HIDDEN.{ext}').format(ext=u(data['entity'].strip('.').rsplit('.', 1)[-1])) - else: - data['entity'] = u('HIDDEN') + extension = u(os.path.splitext(data['entity'])[1]) + data['entity'] = u('HIDDEN{0}').format(extension) if stats.get('lines'): data['lines'] = stats['lines'] if stats.get('language'): diff --git a/wakatime/languages/__init__.py b/wakatime/languages/__init__.py index 317336a..1795880 100644 --- a/wakatime/languages/__init__.py +++ b/wakatime/languages/__init__.py @@ -83,7 +83,7 @@ class DependencyParser(object): self.lexer = lexer if self.lexer: - module_name = self.lexer.__module__.split('.')[-1] + module_name = self.lexer.__module__.rsplit('.', 1)[-1] class_name = self.lexer.__class__.__name__.replace('Lexer', 'Parser', 1) else: module_name = 'unknown'