Skip to content

Commit

Permalink
refactor: reorganize homeassistant specific files
Browse files Browse the repository at this point in the history
  • Loading branch information
alandtse committed Jul 29, 2020
1 parent 9793ee0 commit f1f5994
Show file tree
Hide file tree
Showing 33 changed files with 98 additions and 86 deletions.
20 changes: 10 additions & 10 deletions teslajsonpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
For more details about this api, please refer to the documentation at
https://github.com/zabuldon/teslajsonpy
"""
from teslajsonpy.battery_sensor import Battery, Range
from teslajsonpy.binary_sensor import (
from teslajsonpy.controller import Controller
from teslajsonpy.exceptions import TeslaException, UnknownPresetMode
from teslajsonpy.homeassistant.battery_sensor import Battery, Range
from teslajsonpy.homeassistant.binary_sensor import (
ChargerConnectionSensor,
OnlineSensor,
ParkingSensor,
)
from teslajsonpy.charger import ChargerSwitch, ChargingSensor, RangeSwitch
from teslajsonpy.climate import Climate, TempSensor
from teslajsonpy.controller import Controller
from teslajsonpy.exceptions import TeslaException, UnknownPresetMode
from teslajsonpy.gps import GPS, Odometer
from teslajsonpy.lock import Lock
from teslajsonpy.sentry_mode import SentryModeSwitch
from teslajsonpy.trunk import TrunkLock, FrunkLock
from teslajsonpy.homeassistant.charger import ChargerSwitch, ChargingSensor, RangeSwitch
from teslajsonpy.homeassistant.climate import Climate, TempSensor
from teslajsonpy.homeassistant.gps import GPS, Odometer
from teslajsonpy.homeassistant.lock import Lock
from teslajsonpy.homeassistant.sentry_mode import SentryModeSwitch
from teslajsonpy.homeassistant.trunk import FrunkLock, TrunkLock

from .__version__ import __version__

Expand Down
2 changes: 1 addition & 1 deletion teslajsonpy/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import aiohttp
from yarl import URL

from teslajsonpy.exceptions import IncompleteCredentials, TeslaException
from teslajsonpy.const import DRIVING_INTERVAL, WEBSOCKET_TIMEOUT
from teslajsonpy.exceptions import IncompleteCredentials, TeslaException

_LOGGER = logging.getLogger(__name__)

Expand Down
28 changes: 14 additions & 14 deletions teslajsonpy/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,10 @@
import time
from typing import Callable, Optional, Text, Tuple

from aiohttp import ClientConnectorError
import backoff
import wrapt
from aiohttp import ClientConnectorError

from teslajsonpy.battery_sensor import Battery, Range
from teslajsonpy.binary_sensor import (
ChargerConnectionSensor,
OnlineSensor,
ParkingSensor,
UpdateSensor,
)
from teslajsonpy.charger import ChargerSwitch, ChargingSensor, RangeSwitch
from teslajsonpy.climate import Climate, TempSensor
from teslajsonpy.connection import Connection
from teslajsonpy.const import (
DRIVING_INTERVAL,
Expand All @@ -31,10 +22,19 @@
SLEEP_INTERVAL,
)
from teslajsonpy.exceptions import RetryLimitError, TeslaException
from teslajsonpy.gps import GPS, Odometer
from teslajsonpy.lock import ChargerLock, Lock
from teslajsonpy.sentry_mode import SentryModeSwitch
from teslajsonpy.trunk import TrunkLock, FrunkLock
from teslajsonpy.homeassistant.battery_sensor import Battery, Range
from teslajsonpy.homeassistant.binary_sensor import (
ChargerConnectionSensor,
OnlineSensor,
ParkingSensor,
UpdateSensor,
)
from teslajsonpy.homeassistant.charger import ChargerSwitch, ChargingSensor, RangeSwitch
from teslajsonpy.homeassistant.climate import Climate, TempSensor
from teslajsonpy.homeassistant.gps import GPS, Odometer
from teslajsonpy.homeassistant.lock import ChargerLock, Lock
from teslajsonpy.homeassistant.sentry_mode import SentryModeSwitch
from teslajsonpy.homeassistant.trunk import FrunkLock, TrunkLock

_LOGGER = logging.getLogger(__name__)

Expand Down
6 changes: 6 additions & 0 deletions teslajsonpy/homeassistant/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
"""
Python Package for controlling Tesla API.
For more details about this api, please refer to the documentation at
https://github.com/zabuldon/teslajsonpy
"""
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
from typing import Dict, Optional, Text

from teslajsonpy.vehicle import VehicleDevice
from teslajsonpy.homeassistant.vehicle import VehicleDevice


class Battery(VehicleDevice):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"""
from typing import Dict, Optional, Text

from teslajsonpy.vehicle import VehicleDevice
from teslajsonpy.const import RELEASE_NOTES_URL
from teslajsonpy.homeassistant.vehicle import VehicleDevice


class BinarySensor(VehicleDevice):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import time
from typing import Dict, Optional, Text

from teslajsonpy.vehicle import VehicleDevice
from teslajsonpy.homeassistant.vehicle import VehicleDevice


class ChargerSwitch(VehicleDevice):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import time
from typing import List, Optional, Text

from teslajsonpy.vehicle import VehicleDevice
from teslajsonpy.exceptions import UnknownPresetMode
from teslajsonpy.homeassistant.vehicle import VehicleDevice


class Climate(VehicleDevice):
Expand Down
2 changes: 1 addition & 1 deletion teslajsonpy/gps.py → teslajsonpy/homeassistant/gps.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
from typing import Optional, Text

from teslajsonpy.vehicle import VehicleDevice
from teslajsonpy.homeassistant.vehicle import VehicleDevice


class GPS(VehicleDevice):
Expand Down
2 changes: 1 addition & 1 deletion teslajsonpy/lock.py → teslajsonpy/homeassistant/lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
import time

from teslajsonpy.vehicle import VehicleDevice
from teslajsonpy.homeassistant.vehicle import VehicleDevice


class Lock(VehicleDevice):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""
import time

from teslajsonpy.vehicle import VehicleDevice
from teslajsonpy.homeassistant.vehicle import VehicleDevice


class SentryModeSwitch(VehicleDevice):
Expand Down
3 changes: 1 addition & 2 deletions teslajsonpy/trunk.py → teslajsonpy/homeassistant/trunk.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
https://github.com/zabuldon/teslajsonpy
"""
import time

from typing import Text

from teslajsonpy.vehicle import VehicleDevice
from teslajsonpy.homeassistant.vehicle import VehicleDevice


class TrunkLock(VehicleDevice):
Expand Down
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions tests/unit_tests/homeassistant/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
"""
Python Package for controlling Tesla API.
For more details about this api, please refer to the documentation at
https://github.com/zabuldon/teslajsonpy
"""
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.battery_sensor import Battery
from teslajsonpy.homeassistant.battery_sensor import Battery

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.binary_sensor import ChargerConnectionSensor
from teslajsonpy.homeassistant.binary_sensor import ChargerConnectionSensor

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.lock import ChargerLock
from teslajsonpy.homeassistant.lock import ChargerLock

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.charger import ChargerSwitch
from teslajsonpy.homeassistant.charger import ChargerSwitch

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.charger import ChargingSensor
from teslajsonpy.homeassistant.charger import ChargingSensor

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import pytest

from teslajsonpy.climate import Climate
from teslajsonpy.controller import Controller
from teslajsonpy.exceptions import UnknownPresetMode
from teslajsonpy.homeassistant.climate import Climate

from tests.tesla_mock import TeslaMock

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.trunk import FrunkLock
from teslajsonpy.homeassistant.trunk import FrunkLock

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.gps import GPS
from teslajsonpy.homeassistant.gps import GPS

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.lock import Lock
from teslajsonpy.homeassistant.lock import Lock

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.gps import Odometer
from teslajsonpy.homeassistant.gps import Odometer

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.binary_sensor import OnlineSensor
from teslajsonpy.homeassistant.binary_sensor import OnlineSensor

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.binary_sensor import ParkingSensor
from teslajsonpy.homeassistant.binary_sensor import ParkingSensor

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.battery_sensor import Range
from teslajsonpy.homeassistant.battery_sensor import Range

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.charger import RangeSwitch
from teslajsonpy.homeassistant.charger import RangeSwitch

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.sentry_mode import SentryModeSwitch
from teslajsonpy.homeassistant.sentry_mode import SentryModeSwitch

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import pytest

from tests.tesla_mock import TeslaMock

from teslajsonpy.controller import Controller
from teslajsonpy.climate import TempSensor
from teslajsonpy.homeassistant.climate import TempSensor

from tests.tesla_mock import TeslaMock


def test_has_battery(monkeypatch):
Expand Down
Loading

0 comments on commit f1f5994

Please sign in to comment.