From 9c9c921922876949fae384a1aea937ef55114168 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@frenck.nl>
Date: Wed, 25 Sep 2019 00:38:20 +0200
Subject: [PATCH] Use Python3 new super syntax sugar (#26890)

---
 homeassistant/components/bloomsky/camera.py           | 2 +-
 homeassistant/components/foscam/camera.py             | 2 +-
 homeassistant/components/graphite/__init__.py         | 2 +-
 homeassistant/components/loopenergy/sensor.py         | 4 ++--
 homeassistant/components/mochad/__init__.py           | 2 +-
 homeassistant/components/nest/binary_sensor.py        | 2 +-
 homeassistant/components/nest/camera.py               | 2 +-
 homeassistant/components/netatmo/camera.py            | 2 +-
 homeassistant/components/nuimo_controller/__init__.py | 2 +-
 homeassistant/components/nx584/binary_sensor.py       | 2 +-
 homeassistant/components/onkyo/media_player.py        | 2 +-
 homeassistant/components/ring/binary_sensor.py        | 2 +-
 homeassistant/components/ring/camera.py               | 2 +-
 homeassistant/components/ring/sensor.py               | 2 +-
 homeassistant/components/squeezebox/media_player.py   | 2 +-
 homeassistant/components/tcp/sensor.py                | 2 +-
 homeassistant/components/tplink/device_tracker.py     | 4 ++--
 homeassistant/components/ubus/device_tracker.py       | 2 +-
 homeassistant/components/uvc/camera.py                | 2 +-
 homeassistant/components/wink/__init__.py             | 4 ++--
 homeassistant/components/wink/switch.py               | 2 +-
 homeassistant/components/zigbee/__init__.py           | 4 ++--
 homeassistant/components/zwave/binary_sensor.py       | 2 +-
 homeassistant/helpers/logging.py                      | 2 +-
 homeassistant/util/yaml/loader.py                     | 2 +-
 tests/components/smhi/common.py                       | 2 +-
 26 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/homeassistant/components/bloomsky/camera.py b/homeassistant/components/bloomsky/camera.py
index 9b8c4ab283f..d62dede5abd 100644
--- a/homeassistant/components/bloomsky/camera.py
+++ b/homeassistant/components/bloomsky/camera.py
@@ -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
diff --git a/homeassistant/components/foscam/camera.py b/homeassistant/components/foscam/camera.py
index 37f792cec45..63e9956d0df 100644
--- a/homeassistant/components/foscam/camera.py
+++ b/homeassistant/components/foscam/camera.py
@@ -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)
diff --git a/homeassistant/components/graphite/__init__.py b/homeassistant/components/graphite/__init__.py
index 550a0ce1d13..3809249bea6 100644
--- a/homeassistant/components/graphite/__init__.py
+++ b/homeassistant/components/graphite/__init__.py
@@ -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
diff --git a/homeassistant/components/loopenergy/sensor.py b/homeassistant/components/loopenergy/sensor.py
index 56a87ce4345..994c3e2fd89 100644
--- a/homeassistant/components/loopenergy/sensor.py
+++ b/homeassistant/components/loopenergy/sensor.py
@@ -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)
 
diff --git a/homeassistant/components/mochad/__init__.py b/homeassistant/components/mochad/__init__.py
index 07028de0d42..77426e8ae2c 100644
--- a/homeassistant/components/mochad/__init__.py
+++ b/homeassistant/components/mochad/__init__.py
@@ -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
 
diff --git a/homeassistant/components/nest/binary_sensor.py b/homeassistant/components/nest/binary_sensor.py
index 0f3ae7da710..05170a54ed1 100644
--- a/homeassistant/components/nest/binary_sensor.py
+++ b/homeassistant/components/nest/binary_sensor.py
@@ -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"
 
diff --git a/homeassistant/components/nest/camera.py b/homeassistant/components/nest/camera.py
index 37fd18efb6d..efc0bfbc822 100644
--- a/homeassistant/components/nest/camera.py
+++ b/homeassistant/components/nest/camera.py
@@ -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
diff --git a/homeassistant/components/netatmo/camera.py b/homeassistant/components/netatmo/camera.py
index d18ff9fc46c..60428961cb9 100644
--- a/homeassistant/components/netatmo/camera.py
+++ b/homeassistant/components/netatmo/camera.py
@@ -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
diff --git a/homeassistant/components/nuimo_controller/__init__.py b/homeassistant/components/nuimo_controller/__init__.py
index 42d35b60b25..8fa3897b735 100644
--- a/homeassistant/components/nuimo_controller/__init__.py
+++ b/homeassistant/components/nuimo_controller/__init__.py
@@ -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
diff --git a/homeassistant/components/nx584/binary_sensor.py b/homeassistant/components/nx584/binary_sensor.py
index 8b26a958a6f..6f1c66d8d87 100644
--- a/homeassistant/components/nx584/binary_sensor.py
+++ b/homeassistant/components/nx584/binary_sensor.py
@@ -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
diff --git a/homeassistant/components/onkyo/media_player.py b/homeassistant/components/onkyo/media_player.py
index 9ec8c56d770..af92f6c5f05 100644
--- a/homeassistant/components/onkyo/media_player.py
+++ b/homeassistant/components/onkyo/media_player.py
@@ -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."""
diff --git a/homeassistant/components/ring/binary_sensor.py b/homeassistant/components/ring/binary_sensor.py
index 6806df0408f..86d26ec25b4 100644
--- a/homeassistant/components/ring/binary_sensor.py
+++ b/homeassistant/components/ring/binary_sensor.py
@@ -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(
diff --git a/homeassistant/components/ring/camera.py b/homeassistant/components/ring/camera.py
index ef86ea6734c..461b3a199d7 100644
--- a/homeassistant/components/ring/camera.py
+++ b/homeassistant/components/ring/camera.py
@@ -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
diff --git a/homeassistant/components/ring/sensor.py b/homeassistant/components/ring/sensor.py
index af661f4571c..6a64226a053 100644
--- a/homeassistant/components/ring/sensor.py
+++ b/homeassistant/components/ring/sensor.py
@@ -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
diff --git a/homeassistant/components/squeezebox/media_player.py b/homeassistant/components/squeezebox/media_player.py
index 9e62e7ee0db..6540fca1405 100644
--- a/homeassistant/components/squeezebox/media_player.py
+++ b/homeassistant/components/squeezebox/media_player.py
@@ -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 = {}
diff --git a/homeassistant/components/tcp/sensor.py b/homeassistant/components/tcp/sensor.py
index 70301f203f8..a387b3fc0bb 100644
--- a/homeassistant/components/tcp/sensor.py
+++ b/homeassistant/components/tcp/sensor.py
@@ -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):
diff --git a/homeassistant/components/tplink/device_tracker.py b/homeassistant/components/tplink/device_tracker.py
index 60d49573833..e7f87074cb4 100644
--- a/homeassistant/components/tplink/device_tracker.py
+++ b/homeassistant/components/tplink/device_tracker.py
@@ -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."""
diff --git a/homeassistant/components/ubus/device_tracker.py b/homeassistant/components/ubus/device_tracker.py
index f14ea5af02c..8c83de202a4 100644
--- a/homeassistant/components/ubus/device_tracker.py
+++ b/homeassistant/components/ubus/device_tracker.py
@@ -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):
diff --git a/homeassistant/components/uvc/camera.py b/homeassistant/components/uvc/camera.py
index 01a3338e540..20aae3849ab 100644
--- a/homeassistant/components/uvc/camera.py
+++ b/homeassistant/components/uvc/camera.py
@@ -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
diff --git a/homeassistant/components/wink/__init__.py b/homeassistant/components/wink/__init__.py
index 5af784359d8..d0bb27c06e1 100644
--- a/homeassistant/components/wink/__init__.py
+++ b/homeassistant/components/wink/__init__.py
@@ -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}
diff --git a/homeassistant/components/wink/switch.py b/homeassistant/components/wink/switch.py
index d888fb82528..07d3ff4becc 100644
--- a/homeassistant/components/wink/switch.py
+++ b/homeassistant/components/wink/switch.py
@@ -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:
diff --git a/homeassistant/components/zigbee/__init__.py b/homeassistant/components/zigbee/__init__.py
index 7c1979f3ab9..31cbc0c65b6 100644
--- a/homeassistant/components/zigbee/__init__.py
+++ b/homeassistant/components/zigbee/__init__.py
@@ -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)
 
diff --git a/homeassistant/components/zwave/binary_sensor.py b/homeassistant/components/zwave/binary_sensor.py
index fd18772edbf..a28f53f93d4 100644
--- a/homeassistant/components/zwave/binary_sensor.py
+++ b/homeassistant/components/zwave/binary_sensor.py
@@ -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
diff --git a/homeassistant/helpers/logging.py b/homeassistant/helpers/logging.py
index e69564453fa..dd9e3833801 100644
--- a/homeassistant/helpers/logging.py
+++ b/homeassistant/helpers/logging.py
@@ -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."""
diff --git a/homeassistant/util/yaml/loader.py b/homeassistant/util/yaml/loader.py
index ccc55691ee1..9822b7c63c2 100644
--- a/homeassistant/util/yaml/loader.py
+++ b/homeassistant/util/yaml/loader.py
@@ -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
 
diff --git a/tests/components/smhi/common.py b/tests/components/smhi/common.py
index ecf904ac9c9..74c8a99b51f 100644
--- a/tests/components/smhi/common.py
+++ b/tests/components/smhi/common.py
@@ -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)