From 227a1b919b5bd30b8f841a77a03b744ab66db405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi> Date: Wed, 19 Sep 2018 16:40:36 +0300 Subject: [PATCH] More isort preparations (#16633) * Adjust config closer to currently established style conventions * Adjust some imports for better outcome with their comments --- homeassistant/components/binary_sensor/zwave.py | 4 ++-- homeassistant/components/climate/zwave.py | 4 ++-- homeassistant/components/cover/zwave.py | 5 ++--- homeassistant/components/ios/__init__.py | 6 +++--- setup.cfg | 5 +++++ 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/homeassistant/components/binary_sensor/zwave.py b/homeassistant/components/binary_sensor/zwave.py index 784a96d8615..3bb3a3c79c5 100644 --- a/homeassistant/components/binary_sensor/zwave.py +++ b/homeassistant/components/binary_sensor/zwave.py @@ -9,8 +9,8 @@ import datetime import homeassistant.util.dt as dt_util from homeassistant.helpers.event import track_point_in_time from homeassistant.components import zwave -from homeassistant.components.zwave import workaround -from homeassistant.components.zwave import async_setup_platform # noqa pylint: disable=unused-import +from homeassistant.components.zwave import ( # noqa pylint: disable=unused-import + async_setup_platform, workaround) from homeassistant.components.binary_sensor import ( DOMAIN, BinarySensorDevice) diff --git a/homeassistant/components/climate/zwave.py b/homeassistant/components/climate/zwave.py index f87f2e83f5d..77b5e111686 100644 --- a/homeassistant/components/climate/zwave.py +++ b/homeassistant/components/climate/zwave.py @@ -10,8 +10,8 @@ from homeassistant.components.climate import ( DOMAIN, ClimateDevice, STATE_AUTO, STATE_COOL, STATE_HEAT, SUPPORT_TARGET_TEMPERATURE, SUPPORT_FAN_MODE, SUPPORT_OPERATION_MODE, SUPPORT_SWING_MODE) -from homeassistant.components.zwave import ZWaveDeviceEntity -from homeassistant.components.zwave import async_setup_platform # noqa pylint: disable=unused-import +from homeassistant.components.zwave import ( # noqa pylint: disable=unused-import + ZWaveDeviceEntity, async_setup_platform) from homeassistant.const import ( STATE_OFF, TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE) diff --git a/homeassistant/components/cover/zwave.py b/homeassistant/components/cover/zwave.py index 8c8c88ecb87..258087702e0 100644 --- a/homeassistant/components/cover/zwave.py +++ b/homeassistant/components/cover/zwave.py @@ -9,10 +9,9 @@ https://home-assistant.io/components/cover.zwave/ import logging from homeassistant.components.cover import ( DOMAIN, SUPPORT_OPEN, SUPPORT_CLOSE, ATTR_POSITION) -from homeassistant.components.zwave import ZWaveDeviceEntity from homeassistant.components import zwave -from homeassistant.components.zwave import async_setup_platform # noqa pylint: disable=unused-import -from homeassistant.components.zwave import workaround +from homeassistant.components.zwave import ( # noqa pylint: disable=unused-import + ZWaveDeviceEntity, async_setup_platform, workaround) from homeassistant.components.cover import CoverDevice _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/ios/__init__.py b/homeassistant/components/ios/__init__.py index a4884739f96..a67be0a63de 100644 --- a/homeassistant/components/ios/__init__.py +++ b/homeassistant/components/ios/__init__.py @@ -9,7 +9,6 @@ import logging import datetime import voluptuous as vol -# from voluptuous.humanize import humanize_error from homeassistant import config_entries from homeassistant.components.http import HomeAssistantView @@ -274,8 +273,9 @@ class iOSIdentifyDeviceView(HomeAssistantView): # try: # data = IDENTIFY_SCHEMA(req_data) # except vol.Invalid as ex: - # return self.json_message(humanize_error(request.json, ex), - # HTTP_BAD_REQUEST) + # return self.json_message( + # vol.humanize.humanize_error(request.json, ex), + # HTTP_BAD_REQUEST) data[ATTR_LAST_SEEN_AT] = datetime.datetime.now().isoformat() diff --git a/setup.cfg b/setup.cfg index a8bd819c792..b2bbb4081f0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,3 +33,8 @@ not_skip = __init__.py # will group `import x` and `from x import` of the same module. force_sort_within_sections = true sections = FUTURE,STDLIB,INBETWEENS,THIRDPARTY,FIRSTPARTY,LOCALFOLDER +default_section = THIRDPARTY +known_first_party = homeassistant,tests +forced_separate = tests +combine_as_imports = true +use_parentheses = true -- GitLab