From a2c6fdd14ce9ef1dfa59db6de91ebf863920d381 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 15 Dec 2020 20:29:24 -0800 Subject: [PATCH] Revert "Handle python-dbus not installed" This reverts commit 25054cdc0538a0324b7f7c1bcc9d6166291b4e10. --- common/hardware_tici.py | 6 +----- selfdrive/loggerd/uploader.py | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/common/hardware_tici.py b/common/hardware_tici.py index aac7a229..2aec9b2e 100644 --- a/common/hardware_tici.py +++ b/common/hardware_tici.py @@ -25,11 +25,7 @@ MM_MODEM_ACCESS_TECHNOLOGY_LTE = 1 << 14 class Tici(HardwareBase): def __init__(self): - # TODO: remove when dbus is installed everywhere - try: - import dbus # pylint: disable=import-error - except ImportError: - return + import dbus # pylint: disable=import-error self.bus = dbus.SystemBus() self.nm = self.bus.get_object(NM, '/org/freedesktop/NetworkManager') diff --git a/selfdrive/loggerd/uploader.py b/selfdrive/loggerd/uploader.py index 354896c1..456712f2 100644 --- a/selfdrive/loggerd/uploader.py +++ b/selfdrive/loggerd/uploader.py @@ -69,10 +69,7 @@ def clear_locks(root): cloudlog.exception("clear_locks failed") def is_on_wifi(): - try: - return HARDWARE.get_network_type() == NetworkType.wifi - except Exception: - return False + return HARDWARE.get_network_type() == NetworkType.wifi class Uploader(): def __init__(self, dongle_id, root):