From 02d54b76f3c63cca54b1538000dd06ce14c371c0 Mon Sep 17 00:00:00 2001
From: Alan Hamlett <alan.hamlett@gmail.com>
Date: Thu, 8 Aug 2013 02:09:54 -0700
Subject: [PATCH] using correct dirname when adding cwd to sys.path in
 wakatime-cli.py fixes to wakatime package to allow directly importing. don't
 add duplicate handlers to logger in log.py.

---
 wakatime-cli.py      | 2 +-
 wakatime/__init__.py | 5 +++++
 wakatime/log.py      | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/wakatime-cli.py b/wakatime-cli.py
index 7095232..1287c89 100644
--- a/wakatime-cli.py
+++ b/wakatime-cli.py
@@ -14,7 +14,7 @@ from __future__ import print_function
 
 import os
 import sys
-sys.path.insert(0, os.path.abspath(__file__))
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 import wakatime
 
 if __name__ == '__main__':
diff --git a/wakatime/__init__.py b/wakatime/__init__.py
index 9db5416..68f4765 100644
--- a/wakatime/__init__.py
+++ b/wakatime/__init__.py
@@ -33,6 +33,7 @@ except ImportError:
     from urllib.error import HTTPError
     from urllib.request import Request, urlopen
 
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 from .log import setup_logging
 from .project import find_project
 try:
@@ -52,6 +53,10 @@ class FileAction(argparse.Action):
 
 
 def parseArguments(argv):
+    try:
+        sys.argv
+    except AttributeError:
+        sys.argv = argv
     parser = argparse.ArgumentParser(
             description='Wakati.Me event api appender')
     parser.add_argument('--file', dest='targetFile', metavar='file',
diff --git a/wakatime/log.py b/wakatime/log.py
index 4023122..9001d17 100644
--- a/wakatime/log.py
+++ b/wakatime/log.py
@@ -63,6 +63,9 @@ class JsonFormatter(logging.Formatter):
 
 
 def setup_logging(args, version):
+    logger = logging.getLogger()
+    if len(logger.handlers) > 0:
+        return logger
     logfile = args.logfile
     if not logfile:
         logfile = '~/.wakatime.log'
@@ -77,7 +80,6 @@ def setup_logging(args, version):
         plugin=args.plugin,
     )
     handler.setFormatter(formatter)
-    logger = logging.getLogger()
     logger.addHandler(handler)
     level = logging.INFO
     if args.verbose: