Pylint cleanups (home-assistant-libs#201)

* Clean up pylintrc Fix section order and option placement, remove duplicated defaults and unneeded disables. * pylint 2 useless-object-inheritance fixes * pylint 2 useless-import-alias fix * Add a disable for pylint 2 consider-using-dict-comprehension Can't come up with a cleaner way to accomplish this particular case using a dict comprehension right now. * Remove unneeded pylint inline disables
ALLTERCO · Jul 16, 2018 · f2febc1 · f2febc1
1 parent 83a5482
commit f2febc1
Show file tree

Hide file tree

Showing 36 changed files with 14 additions and 50 deletions.
diff --git a/netdisco/daikin.py b/netdisco/daikin.py
@@ -1,7 +1,6 @@
 """Daikin device discovery."""
 import socket
 
-# pylint: disable=unused-import, import-error, no-name-in-module
 try:
  # Py2
  from urlparse import unquote # noqa
@@ -20,7 +19,7 @@
 DISCOVERY_TIMEOUT = timedelta(seconds=2)
 
 
-class Daikin(object):
+class Daikin:
  """Base class to discover Daikin devices."""
 
  def __init__(self):
@@ -53,6 +52,7 @@ def update(self):
  try:
  data, (address, _) = sock.recvfrom(1024)
 
+ # pylint: disable=consider-using-dict-comprehension
  entry = dict([e.split('=')
  for e in data.decode("UTF-8").split(',')])
 

diff --git a/netdisco/discoverables/DLNA.py b/netdisco/discoverables/DLNA.py
@@ -2,7 +2,6 @@
 from . import SSDPDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(SSDPDiscoverable):
  """Add support for discovering DLNA services."""
 

diff --git a/netdisco/discoverables/__init__.py b/netdisco/discoverables/__init__.py
@@ -9,7 +9,7 @@
  ATTR_PROPERTIES, ATTR_MANUFACTURER, ATTR_UDN, ATTR_UPNP_DEVICE_TYPE)
 
 
-class BaseDiscoverable(object):
+class BaseDiscoverable:
  """Base class for discoverable services or device types."""
 
  def is_discovered(self):
@@ -28,7 +28,6 @@ def info_from_entry(self, entry):
  """Return an object with important info from the entry."""
  return entry
 
- # pylint: disable=no-self-use
  def get_entries(self):
  """Return all the discovered entries."""
  raise NotImplementedError()

diff --git a/netdisco/discoverables/apple_tv.py b/netdisco/discoverables/apple_tv.py
@@ -3,7 +3,6 @@
 from ..const import ATTR_NAME, ATTR_PROPERTIES
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for Apple TV devices."""
 

diff --git a/netdisco/discoverables/arduino.py b/netdisco/discoverables/arduino.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Arduino devices."""
 

diff --git a/netdisco/discoverables/axis.py b/netdisco/discoverables/axis.py
@@ -5,7 +5,6 @@
  ATTR_HOST, ATTR_PORT, ATTR_HOSTNAME, ATTR_PROPERTIES)
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Axis devices."""
 

diff --git a/netdisco/discoverables/bluesound.py b/netdisco/discoverables/bluesound.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Bluesound service."""
 

diff --git a/netdisco/discoverables/bose_soundtouch.py b/netdisco/discoverables/bose_soundtouch.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Bose SoundTouch devices."""
 

diff --git a/netdisco/discoverables/freebox.py b/netdisco/discoverables/freebox.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Freebox routers."""
 

diff --git a/netdisco/discoverables/fritzbox.py b/netdisco/discoverables/fritzbox.py
@@ -2,7 +2,6 @@
 from . import SSDPDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(SSDPDiscoverable):
  """Add support for discovering AVM FRITZ devices."""
 

diff --git a/netdisco/discoverables/google_cast.py b/netdisco/discoverables/google_cast.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Google Cast platform devices."""
 

diff --git a/netdisco/discoverables/hass_ios.py b/netdisco/discoverables/hass_ios.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering the Home Assistant iOS app."""
 

diff --git a/netdisco/discoverables/home_assistant.py b/netdisco/discoverables/home_assistant.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Home Assistant instances."""
 

diff --git a/netdisco/discoverables/homekit.py b/netdisco/discoverables/homekit.py
@@ -4,7 +4,6 @@
 from ..const import ATTR_NAME
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering HomeKit devices."""
 

diff --git a/netdisco/discoverables/ikea_tradfri.py b/netdisco/discoverables/ikea_tradfri.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Ikea Tradfri devices."""
 

diff --git a/netdisco/discoverables/kodi.py b/netdisco/discoverables/kodi.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Kodi."""
 

diff --git a/netdisco/discoverables/lutron.py b/netdisco/discoverables/lutron.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Lutron Caseta Smart Bridge
  and Smart Bridge Pro devices."""

diff --git a/netdisco/discoverables/nanoleaf_aurora.py b/netdisco/discoverables/nanoleaf_aurora.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Nanoleaf Aurora devices."""
 

diff --git a/netdisco/discoverables/openhome.py b/netdisco/discoverables/openhome.py
@@ -2,7 +2,6 @@
 from . import SSDPDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(SSDPDiscoverable):
  """Add support for discovering Openhome compliant devices."""
 

diff --git a/netdisco/discoverables/panasonic_viera.py b/netdisco/discoverables/panasonic_viera.py
@@ -2,7 +2,6 @@
 from . import SSDPDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(SSDPDiscoverable):
  """Add support for discovering Viera TV devices."""
 

diff --git a/netdisco/discoverables/sabnzbd.py b/netdisco/discoverables/sabnzbd.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering SABnzbd."""
 

diff --git a/netdisco/discoverables/sonos.py b/netdisco/discoverables/sonos.py
@@ -2,7 +2,6 @@
 from . import SSDPDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(SSDPDiscoverable):
  """Add support for discovering Sonos devices."""
 

diff --git a/netdisco/discoverables/spotify_connect.py b/netdisco/discoverables/spotify_connect.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Spotify Connect service."""
 

diff --git a/netdisco/discoverables/tivo_dvr.py b/netdisco/discoverables/tivo_dvr.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering TiVo Remote Protocol service."""
 

diff --git a/netdisco/discoverables/volumio.py b/netdisco/discoverables/volumio.py
@@ -2,7 +2,6 @@
 from . import MDNSDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Volumio."""
 

diff --git a/netdisco/discoverables/webos_tv.py b/netdisco/discoverables/webos_tv.py
@@ -2,7 +2,6 @@
 from . import SSDPDiscoverable
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(SSDPDiscoverable):
  """Add support for discovering LG WebOS TV devices."""
 

diff --git a/netdisco/discoverables/xiaomi_gw.py b/netdisco/discoverables/xiaomi_gw.py
@@ -3,7 +3,6 @@
 from ..const import ATTR_MAC_ADDRESS, ATTR_PROPERTIES
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Xiaomi Gateway"""
 

diff --git a/netdisco/discoverables/yeelight.py b/netdisco/discoverables/yeelight.py
@@ -5,7 +5,6 @@
 DEVICE_NAME_PREFIX = 'yeelink-light-'
 
 
-# pylint: disable=too-few-public-methods
 class Discoverable(MDNSDiscoverable):
  """Add support for discovering Yeelight."""
 

diff --git a/netdisco/discovery.py b/netdisco/discovery.py
@@ -13,7 +13,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-class NetworkDiscovery(object):
+class NetworkDiscovery:
  """Scan the network for devices.
 
  mDNS scans in a background thread.

diff --git a/netdisco/gdm.py b/netdisco/gdm.py
@@ -10,7 +10,7 @@
 import struct
 
 
-class GDM(object):
+class GDM:
  """Base class to discover GDM services."""
 
  def __init__(self):
@@ -95,7 +95,6 @@ def update(self):
 
 def main():
  """Test GDM discovery."""
- # pylint: disable=invalid-name
  from pprint import pprint
 
  gdm = GDM()

diff --git a/netdisco/lms.py b/netdisco/lms.py
@@ -7,7 +7,7 @@
 DEFAULT_DISCOVERY_TIMEOUT = 2
 
 
-class LMS(object):
+class LMS:
  """Base class to discover Logitech Media servers."""
 
  def __init__(self):
@@ -67,7 +67,6 @@ def main():
  """Test LMS discovery."""
  from pprint import pprint
 
- # pylint: disable=invalid-name
  lms = LMS()
 
  pprint("Scanning for Logitech Media Servers...")

diff --git a/netdisco/mdns.py b/netdisco/mdns.py
@@ -2,7 +2,7 @@
 import zeroconf
 
 
-class MDNS(object):
+class MDNS:
  """Base class to discover mDNS services."""
 
  def __init__(self):

diff --git a/netdisco/ssdp.py b/netdisco/ssdp.py
@@ -4,7 +4,7 @@
 import socket
 import logging
 from datetime import datetime, timedelta
-import xml.etree.ElementTree as ElementTree
+from xml.etree import ElementTree
 
 import requests
 
@@ -27,7 +27,7 @@
 ST_ROOTDEVICE = "upnp:rootdevice"
 
 
-class SSDP(object):
+class SSDP:
  """Control the scanning of uPnP devices and services and caches output."""
 
  def __init__(self):
@@ -96,7 +96,7 @@ def remove_expired(self):
  if not entry.is_expired]
 
 
-class UPNPEntry(object):
+class UPNPEntry:
  """Found uPnP entry."""
 
  DESCRIPTION_CACHE = {'_NO_LOCATION': {}}

diff --git a/netdisco/tellstick.py b/netdisco/tellstick.py
@@ -9,7 +9,7 @@
 DISCOVERY_TIMEOUT = timedelta(seconds=2)
 
 
-class Tellstick(object):
+class Tellstick:
  """Base class to discover Tellstick devices."""
 
  def __init__(self):

diff --git a/netdisco/util.py b/netdisco/util.py
@@ -37,7 +37,6 @@ def interface_addresses(family=netifaces.AF_INET):
  Gathering of addresses which are bound to a local interface that has
  broadcast (and probably multicast) capability.
  """
- # pylint: disable=no-member
  return [addr['addr']
  for i in netifaces.interfaces()
  for addr in netifaces.ifaddresses(i).get(family) or []

diff --git a/pylintrc b/pylintrc
@@ -1,11 +1,5 @@
-[BASIC]
-module-naming-style=snake_case
-module-rgx=(([a-z_][a-z0-9_]*)|(?:DLNA))$
-
 [MASTER]
-reports=no
+disable=duplicate-code
 
-disable=locally-disabled,duplicate-code
-
-[EXCEPTIONS]
-overgeneral-exceptions=Exception
+[BASIC]
+module-rgx=(([a-z_][a-z0-9_]*)|(?:DLNA))$