Skip to content

Commit

Permalink
isort
Browse files Browse the repository at this point in the history
  • Loading branch information
Julius2342 committed Jan 10, 2018
1 parent 7034736 commit 47c941b
Show file tree
Hide file tree
Showing 30 changed files with 51 additions and 44 deletions.
2 changes: 1 addition & 1 deletion examples/example_tunnel.py
Expand Up @@ -3,7 +3,7 @@


from xknx import XKNX from xknx import XKNX
from xknx.io import GatewayScanner, Tunnel from xknx.io import GatewayScanner, Tunnel
from xknx.knx import GroupAddress, PhysicalAddress, DPTBinary, Telegram from xknx.knx import DPTBinary, GroupAddress, PhysicalAddress, Telegram




async def main(): async def main():
Expand Down
6 changes: 3 additions & 3 deletions test/climate_test.py
Expand Up @@ -6,9 +6,9 @@
from xknx import XKNX from xknx import XKNX
from xknx.devices import Climate from xknx.devices import Climate
from xknx.exceptions import DeviceIllegalValue from xknx.exceptions import DeviceIllegalValue
from xknx.knx import (GroupAddress, DPTArray, DPTBinary, DPTControllerStatus, from xknx.knx import (DPT2ByteFloat, DPTArray, DPTBinary, DPTControllerStatus,
DPT2ByteFloat, DPTHVACMode, DPTTemperature, DPTValue1Count, DPTHVACMode, DPTTemperature, DPTValue1Count,
HVACOperationMode, Telegram, TelegramType) GroupAddress, HVACOperationMode, Telegram, TelegramType)




class TestClimate(unittest.TestCase): class TestClimate(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions test/config_test.py
Expand Up @@ -3,8 +3,8 @@
import unittest import unittest


from xknx import XKNX from xknx import XKNX
from xknx.devices import (Action, BinarySensor, Climate, Cover, Light, from xknx.devices import (Action, BinarySensor, Climate, Cover, DateTime,
Notification, Sensor, Switch, DateTime) Light, Notification, Sensor, Switch)
from xknx.devices.datetime import DateTimeBroadcastType from xknx.devices.datetime import DateTimeBroadcastType




Expand Down
2 changes: 1 addition & 1 deletion test/cover_test.py
Expand Up @@ -6,7 +6,7 @@


from xknx import XKNX from xknx import XKNX
from xknx.devices import Cover from xknx.devices import Cover
from xknx.knx import GroupAddress, DPTArray, DPTBinary, Telegram, TelegramType from xknx.knx import DPTArray, DPTBinary, GroupAddress, Telegram, TelegramType




class TestCover(unittest.TestCase): class TestCover(unittest.TestCase):
Expand Down
1 change: 0 additions & 1 deletion test/datetime_test.py
Expand Up @@ -9,7 +9,6 @@
from xknx.devices.datetime import DateTimeBroadcastType from xknx.devices.datetime import DateTimeBroadcastType
from xknx.knx import GroupAddress, TelegramType from xknx.knx import GroupAddress, TelegramType



MOCK_LOCALTIME = Mock() MOCK_LOCALTIME = Mock()
# Mocked time: 2017-01-07 09:13:14 - a Saturday # Mocked time: 2017-01-07 09:13:14 - a Saturday
MOCK_LOCALTIME.return_value = time.struct_time([2017, 1, 7, 9, 13, 14, 6, 0, 0]) MOCK_LOCALTIME.return_value = time.struct_time([2017, 1, 7, 9, 13, 14, 6, 0, 0])
Expand Down
3 changes: 1 addition & 2 deletions test/dpt_4byte_test.py
Expand Up @@ -2,8 +2,7 @@
import unittest import unittest


from xknx.exceptions import ConversionError from xknx.exceptions import ConversionError
from xknx.knx import DPT4ByteUnsigned from xknx.knx import DPT4ByteSigned, DPT4ByteUnsigned
from xknx.knx import DPT4ByteSigned




class TestDPT4Byte(unittest.TestCase): class TestDPT4Byte(unittest.TestCase):
Expand Down
5 changes: 3 additions & 2 deletions test/dpt_float_test.py
Expand Up @@ -2,8 +2,9 @@
import unittest import unittest


from xknx.exceptions import ConversionError from xknx.exceptions import ConversionError
from xknx.knx import DPT2ByteFloat, DPT4ByteFloat, DPTHumidity, DPTLux, DPTTemperature, DPTElectricPotential, \ from xknx.knx import (DPT2ByteFloat, DPT4ByteFloat, DPTElectricCurrent,
DPTElectricCurrent, DPTPower, DPTFrequency, DPTPhaseAngleDeg DPTElectricPotential, DPTFrequency, DPTHumidity, DPTLux,
DPTPhaseAngleDeg, DPTPower, DPTTemperature)




class TestDPTFloat(unittest.TestCase): class TestDPTFloat(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions test/knxip_routing_indication_test.py
Expand Up @@ -3,8 +3,8 @@
import unittest import unittest


from xknx import XKNX from xknx import XKNX
from xknx.knx import (GroupAddress, PhysicalAddress, DPTArray, DPTBinary, DPTTemperature, DPTTime, from xknx.knx import (DPTArray, DPTBinary, DPTTemperature, DPTTime,
Telegram, TelegramType) GroupAddress, PhysicalAddress, Telegram, TelegramType)
from xknx.knxip import CEMIFrame, KNXIPFrame, KNXIPServiceType from xknx.knxip import CEMIFrame, KNXIPFrame, KNXIPServiceType




Expand Down
2 changes: 1 addition & 1 deletion test/knxip_tunnelling_request_test.py
Expand Up @@ -3,7 +3,7 @@
import unittest import unittest


from xknx import XKNX from xknx import XKNX
from xknx.knx import GroupAddress, DPTBinary, Telegram from xknx.knx import DPTBinary, GroupAddress, Telegram
from xknx.knxip import (CEMIFrame, KNXIPFrame, KNXIPServiceType, from xknx.knxip import (CEMIFrame, KNXIPFrame, KNXIPServiceType,
TunnellingRequest) TunnellingRequest)


Expand Down
2 changes: 1 addition & 1 deletion test/light_test.py
Expand Up @@ -5,7 +5,7 @@


from xknx import XKNX from xknx import XKNX
from xknx.devices import Light from xknx.devices import Light
from xknx.knx import GroupAddress, DPTArray, DPTBinary, Telegram, TelegramType from xknx.knx import DPTArray, DPTBinary, GroupAddress, Telegram, TelegramType




class TestLight(unittest.TestCase): class TestLight(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion test/sensor_test.py
Expand Up @@ -5,7 +5,7 @@


from xknx import XKNX from xknx import XKNX
from xknx.devices import Sensor from xknx.devices import Sensor
from xknx.knx import GroupAddress, DPTArray, DPTBinary, Telegram, TelegramType from xknx.knx import DPTArray, DPTBinary, GroupAddress, Telegram, TelegramType




class TestSensor(unittest.TestCase): class TestSensor(unittest.TestCase):
Expand Down
7 changes: 4 additions & 3 deletions test/str_test.py
Expand Up @@ -4,12 +4,13 @@


from xknx import XKNX from xknx import XKNX
from xknx.devices import (Action, ActionBase, ActionCallback, BinarySensor, from xknx.devices import (Action, ActionBase, ActionCallback, BinarySensor,
Climate, Cover, Light, Notification, RemoteValue, Climate, Cover, DateTime, Light, Notification,
Sensor, Switch, DateTime) RemoteValue, Sensor, Switch)
from xknx.exceptions import (ConversionError, CouldNotParseAddress, from xknx.exceptions import (ConversionError, CouldNotParseAddress,
CouldNotParseKNXIP, CouldNotParseTelegram, CouldNotParseKNXIP, CouldNotParseTelegram,
DeviceIllegalValue) DeviceIllegalValue)
from xknx.knx import GroupAddress, DPTArray, DPTBinary, Telegram, PhysicalAddress from xknx.knx import (DPTArray, DPTBinary, GroupAddress, PhysicalAddress,
Telegram)
from xknx.knxip import (HPAI, CEMIFrame, ConnectionStateRequest, from xknx.knxip import (HPAI, CEMIFrame, ConnectionStateRequest,
ConnectionStateResponse, ConnectRequest, ConnectionStateResponse, ConnectRequest,
ConnectRequestType, ConnectResponse, ConnectRequestType, ConnectResponse,
Expand Down
2 changes: 1 addition & 1 deletion test/switch_test.py
Expand Up @@ -5,7 +5,7 @@


from xknx import XKNX from xknx import XKNX
from xknx.devices import Switch from xknx.devices import Switch
from xknx.knx import GroupAddress, DPTBinary, Telegram, TelegramType from xknx.knx import DPTBinary, GroupAddress, Telegram, TelegramType




class TestSwitch(unittest.TestCase): class TestSwitch(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion test/telegram_received_cb_test.py
Expand Up @@ -4,7 +4,7 @@
from unittest.mock import Mock from unittest.mock import Mock


from xknx import XKNX from xknx import XKNX
from xknx.knx import (GroupAddress, AddressFilter, DPTBinary, Telegram, from xknx.knx import (AddressFilter, DPTBinary, GroupAddress, Telegram,
TelegramDirection) TelegramDirection)




Expand Down
4 changes: 2 additions & 2 deletions xknx/core/config.py
Expand Up @@ -7,8 +7,8 @@


import yaml import yaml


from xknx.devices import (BinarySensor, Climate, Cover, Light, Notification, from xknx.devices import (BinarySensor, Climate, Cover, DateTime, Light,
Sensor, Switch, DateTime) Notification, Sensor, Switch)
from xknx.knx import PhysicalAddress from xknx.knx import PhysicalAddress




Expand Down
2 changes: 1 addition & 1 deletion xknx/devices/binary_sensor.py
Expand Up @@ -8,8 +8,8 @@
A BinarySensor may also have Actions attached which are executed after state was changed. A BinarySensor may also have Actions attached which are executed after state was changed.
""" """
import time
import asyncio import asyncio
import time
from enum import Enum from enum import Enum


from xknx.exceptions import CouldNotParseTelegram from xknx.exceptions import CouldNotParseTelegram
Expand Down
4 changes: 2 additions & 2 deletions xknx/devices/climate.py
Expand Up @@ -5,8 +5,8 @@
* Manages and sends the desired setpoint to KNX bus. * Manages and sends the desired setpoint to KNX bus.
""" """
from xknx.exceptions import CouldNotParseTelegram, DeviceIllegalValue from xknx.exceptions import CouldNotParseTelegram, DeviceIllegalValue
from xknx.knx import (GroupAddress, DPTArray, DPTBinary, DPTControllerStatus, from xknx.knx import (DPTArray, DPTBinary, DPTControllerStatus, DPTHVACMode,
DPTHVACMode, HVACOperationMode) GroupAddress, HVACOperationMode)


from .device import Device from .device import Device
from .remote_value import RemoteValue1Count, RemoteValueTemp from .remote_value import RemoteValue1Count, RemoteValueTemp
Expand Down
4 changes: 3 additions & 1 deletion xknx/devices/datetime.py
Expand Up @@ -7,7 +7,9 @@
""" """


from enum import Enum from enum import Enum
from xknx.knx import GroupAddress, DPTArray, DPTDateTime, DPTTime, DPTDate
from xknx.knx import DPTArray, DPTDate, DPTDateTime, DPTTime, GroupAddress

from .device import Device from .device import Device




Expand Down
2 changes: 1 addition & 1 deletion xknx/devices/light.py
Expand Up @@ -8,7 +8,7 @@
* reading the current state from KNX bus. * reading the current state from KNX bus.
""" """
from xknx.exceptions import CouldNotParseTelegram from xknx.exceptions import CouldNotParseTelegram
from xknx.knx import GroupAddress, DPTArray from xknx.knx import DPTArray, GroupAddress


from .device import Device from .device import Device
from .remote_value import RemoteValueSwitch1001 from .remote_value import RemoteValueSwitch1001
Expand Down
2 changes: 1 addition & 1 deletion xknx/devices/notification.py
@@ -1,6 +1,6 @@
"""Module for managing a notification via KNX.""" """Module for managing a notification via KNX."""
from xknx.exceptions import CouldNotParseTelegram from xknx.exceptions import CouldNotParseTelegram
from xknx.knx import GroupAddress, DPTArray, DPTString from xknx.knx import DPTArray, DPTString, GroupAddress


from .device import Device from .device import Device


Expand Down
4 changes: 2 additions & 2 deletions xknx/devices/remote_value.py
Expand Up @@ -8,8 +8,8 @@
from enum import Enum from enum import Enum


from xknx.exceptions import ConversionError, CouldNotParseTelegram from xknx.exceptions import ConversionError, CouldNotParseTelegram
from xknx.knx import (GroupAddress, DPTArray, DPTBinary, DPTScaling, DPTTemperature, from xknx.knx import (DPTArray, DPTBinary, DPTScaling, DPTTemperature,
DPTValue1Count, Telegram) DPTValue1Count, GroupAddress, Telegram)




class RemoteValue(): class RemoteValue():
Expand Down
13 changes: 7 additions & 6 deletions xknx/devices/sensor.py
Expand Up @@ -6,12 +6,13 @@
* reading the current state from KNX bus. * reading the current state from KNX bus.
* watching for state updates from KNX bus. * watching for state updates from KNX bus.
""" """
from xknx.knx import (GroupAddress, DPTArray, DPTBinary, DPTHumidity, DPTLux, from xknx.knx import (DPT2ByteFloat, DPT2ByteUnsigned, DPT4ByteFloat,
DPTScaling, DPTTemperature, DPTElectricPotential, DPT4ByteSigned, DPT4ByteUnsigned, DPTArray, DPTBinary,
DPTElectricCurrent, DPTPower, DPTUElCurrentmA, DPTWsp, DPTBrightness, DPTElectricCurrent, DPTElectricPotential,
DPTBrightness, DPTEnergy, DPTHeatFlowRate, DPTFrequency, DPTPhaseAngleRad, DPTPhaseAngleDeg, DPTEnergy, DPTFrequency, DPTHeatFlowRate, DPTHumidity,
DPTPowerFactor, DPTSpeed, DPTLux, DPTPhaseAngleDeg, DPTPhaseAngleRad, DPTPower,
DPT2ByteUnsigned, DPT2ByteFloat, DPT4ByteUnsigned, DPT4ByteSigned, DPT4ByteFloat) DPTPowerFactor, DPTScaling, DPTSpeed, DPTTemperature,
DPTUElCurrentmA, DPTWsp, GroupAddress)


from .device import Device from .device import Device


Expand Down
2 changes: 1 addition & 1 deletion xknx/knx/address.py
Expand Up @@ -12,8 +12,8 @@
* 2nd level: "1/2" * 2nd level: "1/2"
* Free format: "123" * Free format: "123"
""" """
from re import compile as re_compile
from enum import Enum from enum import Enum
from re import compile as re_compile


from xknx.exceptions import CouldNotParseAddress from xknx.exceptions import CouldNotParseAddress


Expand Down
1 change: 1 addition & 0 deletions xknx/knx/dpt.py
@@ -1,5 +1,6 @@
"""Implementation of Basic KNX datatypes.""" """Implementation of Basic KNX datatypes."""
from enum import Enum from enum import Enum

from xknx.exceptions import ConversionError from xknx.exceptions import ConversionError




Expand Down
1 change: 1 addition & 0 deletions xknx/knx/dpt_4byte.py
Expand Up @@ -7,6 +7,7 @@
""" """


import struct import struct

from xknx.exceptions import ConversionError from xknx.exceptions import ConversionError


from .dpt import DPTBase from .dpt import DPTBase
Expand Down
4 changes: 2 additions & 2 deletions xknx/knx/dpt_datetime.py
Expand Up @@ -3,8 +3,8 @@
import time import time


from xknx.exceptions import ConversionError from xknx.exceptions import ConversionError
from .dpt import DPTBase
from .dpt import DPTWeekday from .dpt import DPTBase, DPTWeekday




class DPTDateTime(DPTBase): class DPTDateTime(DPTBase):
Expand Down
1 change: 1 addition & 0 deletions xknx/knx/dpt_float.py
Expand Up @@ -7,6 +7,7 @@
""" """


import struct import struct

from xknx.exceptions import ConversionError from xknx.exceptions import ConversionError


from .dpt import DPTBase from .dpt import DPTBase
Expand Down
2 changes: 2 additions & 0 deletions xknx/knx/dpt_hvac_mode.py
@@ -1,7 +1,9 @@
"""Implementation of different KNX DPT HVAC Operation modes.""" """Implementation of different KNX DPT HVAC Operation modes."""


from enum import Enum from enum import Enum

from xknx.exceptions import CouldNotParseKNXIP from xknx.exceptions import CouldNotParseKNXIP

from .dpt import DPTBase from .dpt import DPTBase




Expand Down
3 changes: 1 addition & 2 deletions xknx/knx/dpt_time.py
Expand Up @@ -4,8 +4,7 @@


from xknx.exceptions import ConversionError from xknx.exceptions import ConversionError


from .dpt import DPTBase from .dpt import DPTBase, DPTWeekday
from .dpt import DPTWeekday




class DPTTime(DPTBase): class DPTTime(DPTBase):
Expand Down
2 changes: 1 addition & 1 deletion xknx/knxip/cemi_frame.py
Expand Up @@ -12,7 +12,7 @@
File: AN117 v02.01 KNX IP Communication Medium DV.pdf File: AN117 v02.01 KNX IP Communication Medium DV.pdf
""" """
from xknx.exceptions import ConversionError, CouldNotParseKNXIP from xknx.exceptions import ConversionError, CouldNotParseKNXIP
from xknx.knx import (GroupAddress, PhysicalAddress, DPTArray, DPTBinary, from xknx.knx import (DPTArray, DPTBinary, GroupAddress, PhysicalAddress,
Telegram, TelegramType) Telegram, TelegramType)


from .body import KNXIPBody from .body import KNXIPBody
Expand Down

0 comments on commit 47c941b

Please sign in to comment.