Merge branch 'master' of https://github.com/jmelen/SickRage into dev

This commit is contained in:
Adam 2014-09-01 10:31:26 +08:00
commit 73cfb28234

View file

@ -20,7 +20,7 @@
import base64 import base64
from httplib import HTTPSConnection, HTTPException from httplib import HTTPSConnection, HTTPException
from urllib import urlencode import json
from ssl import SSLError from ssl import SSLError
import sickbeard import sickbeard
from sickbeard import logger, common from sickbeard import logger, common
@ -97,8 +97,9 @@ class PushbulletNotifier:
'body': message.encode('utf-8'), 'body': message.encode('utf-8'),
'device_iden': pushbullet_device, 'device_iden': pushbullet_device,
'type': notificationType} 'type': notificationType}
http_handler.request(method, uri, body=urlencode(data), data = json.dumps(data)
headers={'Authorization': 'Basic %s' % authString}) http_handler.request(method, uri, body=data,
headers={'Content-Type': 'application/json', 'Authorization': 'Basic %s' % authString})
pass pass
except (SSLError, HTTPException): except (SSLError, HTTPException):
return False return False