From f9dd03dc0fa931ffb94d1002b3827c39f9601813 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Wed, 26 Oct 2016 00:24:45 +0000 Subject: [PATCH] Handle NoneType iteration errors on empty fleetup result. Closes #558 --- services/managers/fleetup_manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/managers/fleetup_manager.py b/services/managers/fleetup_manager.py index be6f5cb0..a2be2699 100644 --- a/services/managers/fleetup_manager.py +++ b/services/managers/fleetup_manager.py @@ -31,7 +31,7 @@ class FleetUpManager: "corporation": row["Corporation"]} for row in fmembers["Data"]} except requests.exceptions.ConnectionError: logger.warn("Can't connect to Fleet-Up API, is it offline?!") - except (ValueError, UnicodeDecodeError): + except (ValueError, UnicodeDecodeError, TypeError): logger.debug("No fleetup members retrieved.") return {} @@ -75,7 +75,7 @@ class FleetUpManager: "notes": row["Notes"]} for row in ftimers["Data"]} except requests.exceptions.ConnectionError: logger.warn("Can't connect to Fleet-Up API, is it offline?!") - except (ValueError, UnicodeDecodeError): + except (ValueError, UnicodeDecodeError, TypeError): logger.debug("No fleetup timers retrieved.") return {} @@ -127,7 +127,7 @@ class FleetUpManager: ffittings["Data"]} except requests.exceptions.ConnectionError: logger.warn("Can't connect to Fleet-Up API, is it offline?!") - except (ValueError, UnicodeDecodeError): + except (ValueError, UnicodeDecodeError, TypeError): logger.debug("No fleetup fittings retrieved.") return {}