From d2a996e845ca7f7d3b4a8852530e964b4d7283d2 Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Fri, 25 Jul 2014 01:01:39 -0700 Subject: [PATCH] upgrade wakatime package to v2.0.4 to prevent logging namespace conflicts --- packages/wakatime/wakatime/__init__.py | 4 ++-- packages/wakatime/wakatime/log.py | 2 +- packages/wakatime/wakatime/project.py | 2 +- packages/wakatime/wakatime/projects/base.py | 2 +- packages/wakatime/wakatime/projects/git.py | 2 +- packages/wakatime/wakatime/projects/mercurial.py | 2 +- packages/wakatime/wakatime/projects/projectmap.py | 2 +- packages/wakatime/wakatime/projects/subversion.py | 2 +- packages/wakatime/wakatime/projects/wakatime.py | 2 +- packages/wakatime/wakatime/queue.py | 2 +- packages/wakatime/wakatime/stats.py | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/wakatime/wakatime/__init__.py b/packages/wakatime/wakatime/__init__.py index 5e78568..6616355 100644 --- a/packages/wakatime/wakatime/__init__.py +++ b/packages/wakatime/wakatime/__init__.py @@ -13,7 +13,7 @@ from __future__ import print_function __title__ = 'wakatime' -__version__ = '2.0.3' +__version__ = '2.0.4' __author__ = 'Alan Hamlett' __license__ = 'BSD' __copyright__ = 'Copyright 2014 Alan Hamlett' @@ -52,7 +52,7 @@ except: from .packages import tzlocal3 -log = logging.getLogger(__name__) +log = logging.getLogger('WakaTime') class FileAction(argparse.Action): diff --git a/packages/wakatime/wakatime/log.py b/packages/wakatime/wakatime/log.py index 6d7acc2..88a21a7 100644 --- a/packages/wakatime/wakatime/log.py +++ b/packages/wakatime/wakatime/log.py @@ -73,7 +73,7 @@ def set_log_level(logger, args): def setup_logging(args, version): - logger = logging.getLogger() + logger = logging.getLogger('WakaTime') set_log_level(logger, args) if len(logger.handlers) > 0: formatter = JsonFormatter(datefmt='%Y/%m/%d %H:%M:%S %z') diff --git a/packages/wakatime/wakatime/project.py b/packages/wakatime/wakatime/project.py index 88827be..56a8657 100644 --- a/packages/wakatime/wakatime/project.py +++ b/packages/wakatime/wakatime/project.py @@ -19,7 +19,7 @@ from .projects.subversion import Subversion from .projects.wakatime import WakaTime -log = logging.getLogger(__name__) +log = logging.getLogger('WakaTime') # List of plugin classes to find a project for the current file path. diff --git a/packages/wakatime/wakatime/projects/base.py b/packages/wakatime/wakatime/projects/base.py index aeafdf7..d1af823 100644 --- a/packages/wakatime/wakatime/projects/base.py +++ b/packages/wakatime/wakatime/projects/base.py @@ -13,7 +13,7 @@ import logging import os -log = logging.getLogger(__name__) +log = logging.getLogger('WakaTime') class BaseProject(object): diff --git a/packages/wakatime/wakatime/projects/git.py b/packages/wakatime/wakatime/projects/git.py index c8539a6..79c925a 100644 --- a/packages/wakatime/wakatime/projects/git.py +++ b/packages/wakatime/wakatime/projects/git.py @@ -15,7 +15,7 @@ import os from .base import BaseProject -log = logging.getLogger(__name__) +log = logging.getLogger('WakaTime') # str is unicode in Python3 diff --git a/packages/wakatime/wakatime/projects/mercurial.py b/packages/wakatime/wakatime/projects/mercurial.py index f91ab71..afaac95 100644 --- a/packages/wakatime/wakatime/projects/mercurial.py +++ b/packages/wakatime/wakatime/projects/mercurial.py @@ -15,7 +15,7 @@ import os from .base import BaseProject -log = logging.getLogger(__name__) +log = logging.getLogger('WakaTime') # str is unicode in Python3 diff --git a/packages/wakatime/wakatime/projects/projectmap.py b/packages/wakatime/wakatime/projects/projectmap.py index ea5ceff..9a4a73e 100644 --- a/packages/wakatime/wakatime/projects/projectmap.py +++ b/packages/wakatime/wakatime/projects/projectmap.py @@ -26,7 +26,7 @@ import os from .base import BaseProject -log = logging.getLogger(__name__) +log = logging.getLogger('WakaTime') # str is unicode in Python3 diff --git a/packages/wakatime/wakatime/projects/subversion.py b/packages/wakatime/wakatime/projects/subversion.py index 9a4c205..5a5551e 100644 --- a/packages/wakatime/wakatime/projects/subversion.py +++ b/packages/wakatime/wakatime/projects/subversion.py @@ -21,7 +21,7 @@ except ImportError: from ..packages.ordereddict import OrderedDict -log = logging.getLogger(__name__) +log = logging.getLogger('WakaTime') # str is unicode in Python3 diff --git a/packages/wakatime/wakatime/projects/wakatime.py b/packages/wakatime/wakatime/projects/wakatime.py index 6eea2a7..14ebe4f 100644 --- a/packages/wakatime/wakatime/projects/wakatime.py +++ b/packages/wakatime/wakatime/projects/wakatime.py @@ -17,7 +17,7 @@ import os from .base import BaseProject -log = logging.getLogger(__name__) +log = logging.getLogger('WakaTime') # str is unicode in Python3 diff --git a/packages/wakatime/wakatime/queue.py b/packages/wakatime/wakatime/queue.py index c253540..81ee2fc 100644 --- a/packages/wakatime/wakatime/queue.py +++ b/packages/wakatime/wakatime/queue.py @@ -22,7 +22,7 @@ except ImportError: HAS_SQL = False -log = logging.getLogger(__name__) +log = logging.getLogger('WakaTime') class Queue(object): diff --git a/packages/wakatime/wakatime/stats.py b/packages/wakatime/wakatime/stats.py index 4c0e168..508a7a2 100644 --- a/packages/wakatime/wakatime/stats.py +++ b/packages/wakatime/wakatime/stats.py @@ -20,7 +20,7 @@ else: from pygments.lexers import guess_lexer_for_filename -log = logging.getLogger(__name__) +log = logging.getLogger('WakaTime') # force file name extensions to be recognized as a certain language