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

using urllib2 again because of problems with requests library

Browse source
This commit is contained in:
Alan Hamlett 2013-09-06 22:41:00 -07:00
parent bf5de0761c
commit 5158783b2f
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
wakatime/__init__.py
View file

@ -31,7 +31,11 @@ import traceback
sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
from .log import setup_logging from .log import setup_logging
from .project import find_project from .project import find_project
from .packages import requests try:
from urllib2 import HTTPError, Request, urlopen
except ImportError:
from urllib.error import HTTPError
from urllib.request import Request, urlopen
try: try:
import argparse import argparse
except ImportError: except ImportError:
@ -138,21 +142,27 @@ def send_action(project=None, branch=None, key=None, targetFile=None,
data['branch'] = branch data['branch'] = branch
log.debug(data) log.debug(data)
# setup api request headers # setup api request
request = Request(url=url, data=str.encode(json.dumps(data)))
request.add_header('User-Agent', get_user_agent(plugin))
request.add_header('Content-Type', 'application/json')
auth = 'Basic %s' % bytes.decode(base64.b64encode(str.encode(key))) auth = 'Basic %s' % bytes.decode(base64.b64encode(str.encode(key)))
headers = { request.add_header('Authorization', auth)
'User-Agent': get_user_agent(plugin),
'Content-Type': 'application/json',
'Authorization': auth,
}
# json request content # log time to api
content = json.dumps(data).encode('utf-8') response = None
# send action to api
try: try:
response = requests.post(url, data=content, headers=headers) response = urlopen(request)
except requests.exceptions.RequestException as exc: except HTTPError as exc:
exception_data = {
'response_code': exc.getcode(),
'response_content': exc.read(),
sys.exc_info()[0].__name__: str(sys.exc_info()[1]),
}
if log.isEnabledFor(logging.DEBUG):
exception_data['traceback'] = traceback.format_exc()
log.error(exception_data)
except:
exception_data = { exception_data = {
sys.exc_info()[0].__name__: str(sys.exc_info()[1]), sys.exc_info()[0].__name__: str(sys.exc_info()[1]),
} }
@ -160,14 +170,14 @@ def send_action(project=None, branch=None, key=None, targetFile=None,
exception_data['traceback'] = traceback.format_exc() exception_data['traceback'] = traceback.format_exc()
log.error(exception_data) log.error(exception_data)
else: else:
if response.status_code == requests.codes.created: if response.getcode() == 201:
log.debug({ log.debug({
'response_code': response.status_code, 'response_code': response.getcode(),
}) })
return True return True
log.error({ log.error({
'response_code': response.status_code, 'response_code': response.getcode(),
'response_content': response.text, 'response_content': response.read(),
}) })
return False return False