Clean up notifiy component

homeassistant/components/notify/instapush.py

@@ -9,6 +9,8 @@ https://home-assistant.io/components/notify.instapush.html
 import logging
 import json
 
+import requests
+
 from homeassistant.helpers import validate_config
 from homeassistant.components.notify import (
     DOMAIN, ATTR_TITLE, BaseNotificationService)
@@ -21,7 +23,7 @@ _RESOURCE = 'https://api.instapush.im/v1/'
 def get_service(hass, config):
     """ Get the instapush notification service. """
 
-    if not validate_config(config,
+    if not validate_config({DOMAIN: config},
                            {DOMAIN: [CONF_API_KEY,
                                      'app_secret',
                                      'event',
@@ -29,52 +31,29 @@ def get_service(hass, config):
                            _LOGGER):
         return None
 
+    headers = {'x-instapush-appid': config[CONF_API_KEY],
+               'x-instapush-appsecret': config['app_secret']}
+
     try:
-        import requests
-
-    except ImportError:
-        _LOGGER.exception(
-            "Unable to import requests. "
-            "Did you maybe not install the 'Requests' package?")
-
+        response = requests.get(_RESOURCE + 'events/list',
+                                headers=headers).json()
+    except ValueError:
+        _LOGGER.error('Unexpected answer from Instapush API.')
         return None
 
-    # pylint: disable=unused-variable
-    try:
-        response = requests.get(_RESOURCE)
+    if 'error' in response:
+        _LOGGER.error(response['msg'])
+        return None
 
-    except requests.ConnectionError:
+    if len([app for app in response if app['title'] == config['event']]) == 0:
         _LOGGER.error(
-            "Connection error "
-            "Please check if https://instapush.im is available.")
-
+            "No app match your given value. "
+            "Please create an app at https://instapush.im")
         return None
 
-    instapush = requests.Session()
-    headers = {'x-instapush-appid': config[DOMAIN][CONF_API_KEY],
-               'x-instapush-appsecret': config[DOMAIN]['app_secret']}
-    response = instapush.get(_RESOURCE + 'events/list',
-                             headers=headers)
-
-    try:
-        if response.json()['error']:
-            _LOGGER.error(response.json()['msg'])
-    # pylint: disable=bare-except
-    except:
-        try:
-            next(events for events in response.json()
-                 if events['title'] == config[DOMAIN]['event'])
-        except StopIteration:
-            _LOGGER.error(
-                "No event match your given value. "
-                "Please create an event at https://instapush.im")
-        else:
-            return InstapushNotificationService(
-                config[DOMAIN].get(CONF_API_KEY),
-                config[DOMAIN]['app_secret'],
-                config[DOMAIN]['event'],
-                config[DOMAIN]['tracker']
-                )
+    return InstapushNotificationService(
+        config[CONF_API_KEY], config['app_secret'], config['event'],
+        config['tracker'])
 
 
 # pylint: disable=too-few-public-methods
@@ -82,9 +61,6 @@ class InstapushNotificationService(BaseNotificationService):
     """ Implements notification service for Instapush. """
 
     def __init__(self, api_key, app_secret, event, tracker):
-        # pylint: disable=no-name-in-module, unused-variable
-        from requests import Session
-
         self._api_key = api_key
         self._app_secret = app_secret
         self._event = event
@@ -94,8 +70,6 @@ class InstapushNotificationService(BaseNotificationService):
             'x-instapush-appsecret': self._app_secret,
             'Content-Type': 'application/json'}
 
-        self.instapush = Session()
-
     def send_message(self, message="", **kwargs):
         """ Send a message to a user. """
 
@@ -104,10 +78,8 @@ class InstapushNotificationService(BaseNotificationService):
         data = {"event": self._event,
                 "trackers": {self._tracker: title + " : " + message}}
 
-        response = self.instapush.post(
-            _RESOURCE + 'post',
-            data=json.dumps(data),
-            headers=self._headers)
+        response = requests.post(_RESOURCE + 'post', data=json.dumps(data),
+                                 headers=self._headers)
 
         if response.json()['status'] == 401:
             _LOGGER.error(