From e9aa35ec276194f89934d9e1f72fdc8ffaf761f8 Mon Sep 17 00:00:00 2001
From: Alan Hamlett <alan.hamlett@gmail.com>
Date: Mon, 12 Aug 2013 03:32:04 -0700
Subject: [PATCH] upgraded wakatime package to v0.3.1

---
 plugin/packages/wakatime/HISTORY.rst          | 11 ++++
 plugin/packages/wakatime/wakatime-cli.py      |  2 +-
 plugin/packages/wakatime/wakatime/__init__.py | 56 +++++++++----------
 plugin/packages/wakatime/wakatime/log.py      | 16 ++++--
 4 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/plugin/packages/wakatime/HISTORY.rst b/plugin/packages/wakatime/HISTORY.rst
index 5115afc..5642693 100644
--- a/plugin/packages/wakatime/HISTORY.rst
+++ b/plugin/packages/wakatime/HISTORY.rst
@@ -2,6 +2,17 @@
 History
 -------
 
+0.3.1 (2013-08-08)
+++++++++++++++++++
+
+- Using requests module instead of urllib2 to verify SSL certs
+
+
+0.3.0 (2013-08-08)
+++++++++++++++++++
+
+- Allow importing directly from Python plugins
+
 
 0.1.1 (2013-07-07)
 ++++++++++++++++++
diff --git a/plugin/packages/wakatime/wakatime-cli.py b/plugin/packages/wakatime/wakatime-cli.py
index 7095232..1287c89 100644
--- a/plugin/packages/wakatime/wakatime-cli.py
+++ b/plugin/packages/wakatime/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/plugin/packages/wakatime/wakatime/__init__.py b/plugin/packages/wakatime/wakatime/__init__.py
index 9db5416..92e16f5 100644
--- a/plugin/packages/wakatime/wakatime/__init__.py
+++ b/plugin/packages/wakatime/wakatime/__init__.py
@@ -12,7 +12,7 @@
 from __future__ import print_function
 
 __title__ = 'wakatime'
-__version__ = '0.2.0'
+__version__ = '0.3.1'
 __author__ = 'Alan Hamlett'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2013 Alan Hamlett'
@@ -27,14 +27,11 @@ import re
 import sys
 import time
 import traceback
-try:
-    from urllib2 import HTTPError, Request, urlopen
-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
+from .packages import requests
 try:
     import argparse
 except ImportError:
@@ -52,6 +49,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',
@@ -136,41 +137,34 @@ def send_action(project=None, tags=None, key=None, targetFile=None,
     if tags:
         data['tags'] = list(set(tags))
     log.debug(data)
-    request = Request(url=url, data=str.encode(json.dumps(data)))
-    user_agent = get_user_agent(plugin)
-    request.add_header('User-Agent', user_agent)
-    request.add_header('Content-Type', 'application/json')
+
+    # setup api request headers
     auth = 'Basic %s' % bytes.decode(base64.b64encode(str.encode(key)))
-    request.add_header('Authorization', auth)
-    response = None
+    headers = {
+        'User-Agent': get_user_agent(plugin),
+        'Content-Type': 'application/json',
+        'Authorization': auth,
+    }
+
+    # send action to api
     try:
-        response = urlopen(request)
-    except HTTPError as exc:
-        data = {
-            'response_code': exc.getcode(),
-            'response_content': exc.read(),
+        response = requests.post(url, data=str.encode(json.dumps(data)), headers=headers)
+    except requests.exceptions.RequestException as exc:
+        exception_data = {
             sys.exc_info()[0].__name__: str(sys.exc_info()[1]),
         }
         if log.isEnabledFor(logging.DEBUG):
-            data['traceback'] = traceback.format_exc()
-        log.error(data)
-    except:
-        data = {
-            sys.exc_info()[0].__name__: str(sys.exc_info()[1]),
-        }
-        if log.isEnabledFor(logging.DEBUG):
-            data['traceback'] = traceback.format_exc()
-        log.error(data)
+            exception_data['traceback'] = traceback.format_exc()
+        log.error(exception_data)
     else:
-        if response.getcode() >= 200 and response.getcode() < 300:
+        if response.status_code == requests.codes.created:
             log.debug({
-                'response_code': response.getcode(),
-                'response_content': response.read(),
+                'response_code': response.status_code,
             })
             return True
         log.error({
-            'response_code': response.getcode(),
-            'response_content': response.read(),
+            'response_code': response.status_code,
+            'response_content': response.text,
         })
     return False
 
diff --git a/plugin/packages/wakatime/wakatime/log.py b/plugin/packages/wakatime/wakatime/log.py
index 4023122..ad61d79 100644
--- a/plugin/packages/wakatime/wakatime/log.py
+++ b/plugin/packages/wakatime/wakatime/log.py
@@ -62,7 +62,18 @@ class JsonFormatter(logging.Formatter):
         return exec_info[2].format_exc()
 
 
+def set_log_level(logger, args):
+    level = logging.WARN
+    if args.verbose:
+        level = logging.DEBUG
+    logger.setLevel(level)
+
+
 def setup_logging(args, version):
+    logger = logging.getLogger()
+    set_log_level(logger, args)
+    if len(logger.handlers) > 0:
+        return logger
     logfile = args.logfile
     if not logfile:
         logfile = '~/.wakatime.log'
@@ -77,10 +88,5 @@ def setup_logging(args, version):
         plugin=args.plugin,
     )
     handler.setFormatter(formatter)
-    logger = logging.getLogger()
     logger.addHandler(handler)
-    level = logging.INFO
-    if args.verbose:
-        level = logging.DEBUG
-    logger.setLevel(level)
     return logger