Use now attr

This commit is contained in:
Pascal Vizeli 2018-04-14 00:19:29 +02:00
parent c5ee2ebc49
commit 41fed656c1
3 changed files with 23 additions and 22 deletions

View File

@ -1,8 +1,8 @@
"""Init file for HassIO docker object."""
from contextlib import suppress
from collections import namedtuple
import logging
import attr
import docker
from .network import DockerNetwork
@ -10,7 +10,8 @@ from ..const import SOCKET_DOCKER
_LOGGER = logging.getLogger(__name__)
CommandReturn = namedtuple('CommandReturn', ['exit_code', 'output'])
# pylint: disable=invalid-name
CommandReturn = attr.make_class('CommandReturn', ['exit_code', 'output'])
class DockerAPI(object):

View File

@ -1,6 +1,5 @@
"""HomeAssistant control object."""
import asyncio
from collections import namedtuple
import logging
import os
import re
@ -9,6 +8,7 @@ import time
import aiohttp
from aiohttp.hdrs import CONTENT_TYPE
import attr
from .const import (
FILE_HASSIO_HOMEASSISTANT, ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_UUID,
@ -24,7 +24,8 @@ _LOGGER = logging.getLogger(__name__)
RE_YAML_ERROR = re.compile(r"homeassistant\.util\.yaml")
ConfigResult = namedtuple('ConfigResult', ['valid', 'log'])
# pylint: disable=invalid-name
ConfigResult = attr.make_class('ConfigResult', ['valid', 'log'])
class HomeAssistant(JsonConfig, CoreSysAttributes):

View File

@ -1,16 +1,18 @@
"""Host Audio-support."""
from collections import namedtuple
import logging
import json
from pathlib import Path
from string import Template
import attr
from ..const import ATTR_INPUT, ATTR_OUTPUT, ATTR_DEVICES, ATTR_NAME
from ..coresys import CoreSysAttributes
_LOGGER = logging.getLogger(__name__)
DefaultConfig = namedtuple('DefaultConfig', ['input', 'output'])
# pylint: disable=invalid-name
DefaultConfig = attr.make_class('DefaultConfig', ['input', 'output'])
class AlsaAudio(CoreSysAttributes):
@ -85,7 +87,6 @@ class AlsaAudio(CoreSysAttributes):
def default(self):
"""Generate ALSA default setting."""
# Init defaults
try:
if self._default is None:
database = self._audio_database()
alsa_input = database.get(self._machine, {}).get(ATTR_INPUT)
@ -102,8 +103,6 @@ class AlsaAudio(CoreSysAttributes):
if self._default.input is None and self.input_devices:
self._default.input = next(iter(self.input_devices))
_LOGGER.info("Detect input device %s", self._default.input)
except:
_LOGGER.exception("hmm2")
return self._default