Use Python3 new super syntax sugar (#26890)

This commit is contained in:
Franck Nijhof 2019-09-25 00:38:20 +02:00 committed by Paulus Schoutsen
parent 6fdff9ffab
commit 9c9c921922
26 changed files with 30 additions and 30 deletions

View File

@ -19,7 +19,7 @@ class BloomSkyCamera(Camera):
def __init__(self, bs, device):
"""Initialize access to the BloomSky camera images."""
super(BloomSkyCamera, self).__init__()
super().__init__()
self._name = device["DeviceName"]
self._id = device["DeviceID"]
self._bloomsky = bs

View File

@ -41,7 +41,7 @@ class FoscamCam(Camera):
"""Initialize a Foscam camera."""
from libpyfoscam import FoscamCamera
super(FoscamCam, self).__init__()
super().__init__()
ip_address = device_info.get(CONF_IP)
port = device_info.get(CONF_PORT)

View File

@ -64,7 +64,7 @@ class GraphiteFeeder(threading.Thread):
def __init__(self, hass, host, port, prefix):
"""Initialize the feeder."""
super(GraphiteFeeder, self).__init__(daemon=True)
super().__init__(daemon=True)
self._hass = hass
self._host = host
self._port = port

View File

@ -122,7 +122,7 @@ class LoopEnergyElec(LoopEnergyDevice):
def __init__(self, controller):
"""Initialize the sensor."""
super(LoopEnergyElec, self).__init__(controller)
super().__init__(controller)
self._name = "Power Usage"
self._controller.subscribe_elecricity(self._callback)
@ -136,7 +136,7 @@ class LoopEnergyGas(LoopEnergyDevice):
def __init__(self, controller):
"""Initialize the sensor."""
super(LoopEnergyGas, self).__init__(controller)
super().__init__(controller)
self._name = "Gas Usage"
self._controller.subscribe_gas(self._callback)

View File

@ -64,7 +64,7 @@ class MochadCtrl:
def __init__(self, host, port):
"""Initialize a PyMochad controller."""
super(MochadCtrl, self).__init__()
super().__init__()
self._host = host
self._port = port

View File

@ -141,7 +141,7 @@ class NestActivityZoneSensor(NestBinarySensor):
def __init__(self, structure, device, zone):
"""Initialize the sensor."""
super(NestActivityZoneSensor, self).__init__(structure, device, "")
super().__init__(structure, device, "")
self.zone = zone
self._name = f"{self._name} {self.zone.name} activity"

View File

@ -34,7 +34,7 @@ class NestCamera(Camera):
def __init__(self, structure, device):
"""Initialize a Nest Camera."""
super(NestCamera, self).__init__()
super().__init__()
self.structure = structure
self.device = device
self._location = None

View File

@ -69,7 +69,7 @@ class NetatmoCamera(Camera):
def __init__(self, data, camera_name, home, camera_type, verify_ssl, quality):
"""Set up for access to the Netatmo camera images."""
super(NetatmoCamera, self).__init__()
super().__init__()
self._data = data
self._camera_name = camera_name
self._verify_ssl = verify_ssl

View File

@ -76,7 +76,7 @@ class NuimoThread(threading.Thread):
def __init__(self, hass, mac, name):
"""Initialize thread object."""
super(NuimoThread, self).__init__()
super().__init__()
self._hass = hass
self._mac = mac
self._name = name

View File

@ -107,7 +107,7 @@ class NX584Watcher(threading.Thread):
def __init__(self, client, zone_sensors):
"""Initialize NX584 watcher thread."""
super(NX584Watcher, self).__init__()
super().__init__()
self.daemon = True
self._client = client
self._zone_sensors = zone_sensors

View File

@ -373,7 +373,7 @@ class OnkyoDeviceZone(OnkyoDevice):
"""Initialize the Zone with the zone identifier."""
self._zone = zone
self._supports_volume = True
super(OnkyoDeviceZone, self).__init__(receiver, sources, name)
super().__init__(receiver, sources, name)
def update(self):
"""Get the latest state from the device."""

View File

@ -65,7 +65,7 @@ class RingBinarySensor(BinarySensorDevice):
def __init__(self, hass, data, sensor_type):
"""Initialize a sensor for Ring device."""
super(RingBinarySensor, self).__init__()
super().__init__()
self._sensor_type = sensor_type
self._data = data
self._name = "{0} {1}".format(

View File

@ -75,7 +75,7 @@ class RingCam(Camera):
def __init__(self, hass, camera, device_info):
"""Initialize a Ring Door Bell camera."""
super(RingCam, self).__init__()
super().__init__()
self._camera = camera
self._hass = hass
self._name = self._camera.name

View File

@ -110,7 +110,7 @@ class RingSensor(Entity):
def __init__(self, hass, data, sensor_type):
"""Initialize a sensor for Ring device."""
super(RingSensor, self).__init__()
super().__init__()
self._sensor_type = sensor_type
self._data = data
self._extra = None

View File

@ -246,7 +246,7 @@ class SqueezeBoxDevice(MediaPlayerDevice):
def __init__(self, lms, player_id, name):
"""Initialize the SqueezeBox device."""
super(SqueezeBoxDevice, self).__init__()
super().__init__()
self._lms = lms
self._id = player_id
self._status = {}

View File

@ -81,7 +81,7 @@ class TcpSensor(Entity):
name = self._config[CONF_NAME]
if name is not None:
return name
return super(TcpSensor, self).name
return super().name
@property
def state(self):

View File

@ -245,7 +245,7 @@ class Tplink3DeviceScanner(Tplink1DeviceScanner):
"""Initialize the scanner."""
self.stok = ""
self.sysauth = ""
super(Tplink3DeviceScanner, self).__init__(config)
super().__init__(config)
def scan_devices(self):
"""Scan for new devices and return a list with found device IDs."""
@ -365,7 +365,7 @@ class Tplink4DeviceScanner(Tplink1DeviceScanner):
"""Initialize the scanner."""
self.credentials = ""
self.token = ""
super(Tplink4DeviceScanner, self).__init__(config)
super().__init__(config)
def scan_devices(self):
"""Scan for new devices and return a list with found device IDs."""

View File

@ -146,7 +146,7 @@ class DnsmasqUbusDeviceScanner(UbusDeviceScanner):
def __init__(self, config):
"""Initialize the scanner."""
super(DnsmasqUbusDeviceScanner, self).__init__(config)
super().__init__(config)
self.leasefile = None
def _generate_mac2name(self):

View File

@ -78,7 +78,7 @@ class UnifiVideoCamera(Camera):
def __init__(self, nvr, uuid, name, password):
"""Initialize an Unifi camera."""
super(UnifiVideoCamera, self).__init__()
super().__init__()
self._nvr = nvr
self._uuid = uuid
self._name = name

View File

@ -863,7 +863,7 @@ class WinkSirenDevice(WinkDevice):
@property
def device_state_attributes(self):
"""Return the device state attributes."""
attributes = super(WinkSirenDevice, self).device_state_attributes
attributes = super().device_state_attributes
auto_shutoff = self.wink.auto_shutoff()
if auto_shutoff is not None:
@ -921,7 +921,7 @@ class WinkNimbusDialDevice(WinkDevice):
@property
def device_state_attributes(self):
"""Return the device state attributes."""
attributes = super(WinkNimbusDialDevice, self).device_state_attributes
attributes = super().device_state_attributes
dial_attributes = self.dial_attributes()
return {**attributes, **dial_attributes}

View File

@ -53,7 +53,7 @@ class WinkToggleDevice(WinkDevice, ToggleEntity):
@property
def device_state_attributes(self):
"""Return the state attributes."""
attributes = super(WinkToggleDevice, self).device_state_attributes
attributes = super().device_state_attributes
try:
event = self.wink.last_event()
if event is not None:

View File

@ -172,7 +172,7 @@ class ZigBeeDigitalInConfig(ZigBeePinConfig):
def __init__(self, config):
"""Initialise the Zigbee Digital input config."""
super(ZigBeeDigitalInConfig, self).__init__(config)
super().__init__(config)
self._bool2state, self._state2bool = self.boolean_maps
@property
@ -216,7 +216,7 @@ class ZigBeeDigitalOutConfig(ZigBeePinConfig):
def __init__(self, config):
"""Initialize the Zigbee Digital out."""
super(ZigBeeDigitalOutConfig, self).__init__(config)
super().__init__(config)
self._bool2state, self._state2bool = self.boolean_maps
self._should_poll = config.get("poll", False)

View File

@ -71,7 +71,7 @@ class ZWaveTriggerSensor(ZWaveBinarySensor):
def __init__(self, values, device_class):
"""Initialize the sensor."""
super(ZWaveTriggerSensor, self).__init__(values, device_class)
super().__init__(values, device_class)
# Set default off delay to 60 sec
self.re_arm_sec = 60
self.invalidate_after = None

View File

@ -29,7 +29,7 @@ class KeywordStyleAdapter(logging.LoggerAdapter):
def __init__(self, logger, extra=None):
"""Initialize a new StyleAdapter for the provided logger."""
super(KeywordStyleAdapter, self).__init__(logger, extra or {})
super().__init__(logger, extra or {})
def log(self, level, msg, *args, **kwargs):
"""Log the message provided at the appropriate level."""

View File

@ -48,7 +48,7 @@ class SafeLineLoader(yaml.SafeLoader):
def compose_node(self, parent: yaml.nodes.Node, index: int) -> yaml.nodes.Node:
"""Annotate a node with the first line it was seen."""
last_line: int = self.line
node: yaml.nodes.Node = super(SafeLineLoader, self).compose_node(parent, index)
node: yaml.nodes.Node = super().compose_node(parent, index)
node.__line__ = last_line + 1 # type: ignore
return node

View File

@ -8,4 +8,4 @@ class AsyncMock(Mock):
# pylint: disable=W0235
async def __call__(self, *args, **kwargs):
"""Hack for async support for Mock."""
return super(AsyncMock, self).__call__(*args, **kwargs)
return super().__call__(*args, **kwargs)