X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=smart_home%2Foutlets.py;h=500ea05372dd200444ba3268427b1d6f814850c9;hb=d2357ff35e7752ae3eb6caa2813c35c17fea778b;hp=d4a4886dd38d1a932494e90f060f4ce884de744d;hpb=6ba90a1f30f1c0cf4df12fcd0c62181f29bc3668;p=python_utils.git diff --git a/smart_home/outlets.py b/smart_home/outlets.py index d4a4886..500ea05 100644 --- a/smart_home/outlets.py +++ b/smart_home/outlets.py @@ -221,15 +221,11 @@ class GoogleOutlet(BaseOutlet): @overrides def turn_on(self) -> bool: - return GoogleOutlet.parse_google_response( - ask_google(f'turn {self.goog_name()} on') - ) + return GoogleOutlet.parse_google_response(ask_google(f'turn {self.goog_name()} on')) @overrides def turn_off(self) -> bool: - return GoogleOutlet.parse_google_response( - ask_google(f'turn {self.goog_name()} off') - ) + return GoogleOutlet.parse_google_response(ask_google(f'turn {self.goog_name()} off')) @overrides def is_on(self) -> bool: @@ -258,9 +254,7 @@ class MerossWrapper(object): def __init__(self): self.loop = asyncio.get_event_loop() self.email = os.environ.get('MEROSS_EMAIL') or scott_secrets.MEROSS_EMAIL - self.password = ( - os.environ.get('MEROSS_PASSWORD') or scott_secrets.MEROSS_PASSWORD - ) + self.password = os.environ.get('MEROSS_PASSWORD') or scott_secrets.MEROSS_PASSWORD self.devices = self.loop.run_until_complete(self.find_meross_devices()) atexit.register(self.loop.close) @@ -307,23 +301,23 @@ class MerossOutlet(BaseOutlet): @overrides def turn_on(self) -> bool: self.lazy_initialize_device() - assert self.meross_wrapper - assert self.device + assert self.meross_wrapper is not None + assert self.device is not None self.meross_wrapper.loop.run_until_complete(self.device.async_turn_on()) return True @overrides def turn_off(self) -> bool: self.lazy_initialize_device() - assert self.meross_wrapper - assert self.device + assert self.meross_wrapper is not None + assert self.device is not None self.meross_wrapper.loop.run_until_complete(self.device.async_turn_off()) return True @overrides def is_on(self) -> bool: self.lazy_initialize_device() - assert self.device + assert self.device is not None return self.device.is_on() @overrides