Skip to content

Fixed traceback when req.status_code is None #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tchellomello merged 2 commits into from
Nov 3, 2017
Merged

Fixed traceback when req.status_code is None #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f58206
Fixed traceback when req.status_code is None
tchellomello Nov 3, 2017
2847ba4
Makes lint happy
tchellomello Nov 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ring_doorbell/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def _process_cached_session(self):
# if not, it should continue to get a new auth token
url = API_URI + DEVICES_ENDPOINT
req = self.query(url, raw=True)
if req.status_code == 200:
if req and req.status_code == 200:
self._authenticate(session=req)
else:
self._authenticate()
Expand All @@ -99,7 +99,8 @@ def _authenticate(self, attempts=RETRY_TOKEN, session=None):
headers=HEADERS)
else:
req = session
except:
except requests.exceptions.RequestException as err_msg:
_LOGGER.error("Error!! %s", err_msg)
raise

# if token is expired, refresh credentials and try again
Expand Down Expand Up @@ -173,7 +174,9 @@ def query(self,

if self.debug:
_LOGGER.debug("_query %s ret %s", loop, req.status_code)
except:

except requests.exceptions.RequestException as err_msg:
_LOGGER.error("Error!! %s", err_msg)
raise

# if token is expired, refresh credentials and try again
Expand Down
16 changes: 5 additions & 11 deletions ring_doorbell/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,8 @@ def _locator(lst, key, value):

def _clean_cache(filename):
"""Remove filename if pickle version mismatch."""
try:
if os.path.isfile(filename):
os.remove(filename)
except:
raise
if os.path.isfile(filename):
os.remove(filename)

# initialize cache since file was removed
initial_cache_data = CACHE_ATTRS
Expand All @@ -40,12 +37,9 @@ def _exists_cache(filename):

def _save_cache(data, filename):
"""Dump data into a pickle file."""
try:
with open(filename, 'wb') as pickle_db:
pickle.dump(data, pickle_db)
return True
except:
raise
with open(filename, 'wb') as pickle_db:
pickle.dump(data, pickle_db)
return True


def _read_cache(filename):
Expand Down