Stashing commit. Getting RecursonError on failed login.

blinkpy/blinkpy.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 """
-blinkpy by Kevin Fronczak - A Blink camera Python library.
-
+blinkpy is an unofficial api for the Blink security camera system.
 https://github.com/fronzbot/blinkpy
+
 Original protocol hacking by MattTW :
 https://github.com/MattTW/BlinkMonitorProtocol
+
 Published under the MIT license - See LICENSE file for more details.
 "Blink Wire-Free HS Home Monitoring & Alert Systems" is a trademark
 owned by Immedia Inc., see www.blinkforhome.com for more information.
-I am in no way affiliated with Blink, nor Immedia Inc.
+blinkpy is in no way affiliated with Blink, nor Immedia Inc.
 """
 
 import time
@@ -34,7 +35,7 @@ class Blink():
     """Class to initialize communication."""
 
     def __init__(self, username=None, password=None,
-                 refresh_rate=REFRESH_RATE):
+                 refresh_rate=REFRESH_RATE, loglevel=logging.INFO):
         """
         Initialize Blink system.
 
@@ -56,11 +57,21 @@ class Blink():
         self.region_id = None
         self.last_refresh = None
         self.refresh_rate = refresh_rate
-        self.session = None
+        self.session = create_session()
         self.networks = []
         self.cameras = CaseInsensitiveDict({})
         self._login_url = LOGIN_URL
         self.version = __version__
+        self._loglevel = loglevel
+
+    @property
+    def loglevel(self):
+        return self._loglevel
+
+    @loglevel.setter
+    def loglevel(self, value):
+        """Sets the logging level."""
+        _LOGGER.setLevel(value)
 
     @property
     def auth_header(self):
@@ -104,7 +115,6 @@ class Blink():
             raise BlinkAuthenticationException(ERROR.PASSWORD)
 
         login_url = LOGIN_URL
-        self.session = create_session()
         response = api.request_login(self,
                                      login_url,
                                      self._username,

blinkpy/helpers/util.py

@@ -64,13 +64,15 @@ def http_req(blink, url='http://example.com', data=None, headers=None,
     prepped = req.prepare()
 
     try:
-        response = blink.session.send(prepped, stream=stream)
+        response = blink.session.send(prepped, stream=stream, timeout=0.1)
         if json_resp and 'code' in response.json():
             if is_retry:
                 _LOGGER.error("Cannot obtain new token for server auth.")
                 return None
             else:
                 headers = attempt_reauthorization(blink)
+                if not headers:
+                    raise exception.ConnectionError
                 return http_req(blink, url=url, data=data, headers=headers,
                                 reqtype=reqtype, stream=stream,
                                 json_resp=json_resp, is_retry=True)