Skip to content

Commit

Permalink
Enhancement: Revert to default logging (#336)
Browse files Browse the repository at this point in the history
* revert and delete central log config

* revert and delete central log config

* fix imports

* use lazy logging
  • Loading branch information
CM000n committed Mar 26, 2024
1 parent 2c8b576 commit 709a8b7
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 87 deletions.
1 change: 0 additions & 1 deletion mytoyota/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from datetime import date, datetime, timezone
from uuid import uuid4

import mytoyota.utils.logging.logging_config # noqa # pylint: disable=unused-import
from mytoyota.const import (
VEHICLE_ASSOCIATION_ENDPOINT,
VEHICLE_GLOBAL_REMOTE_ELECTRIC_STATUS_ENDPOINT,
Expand Down
1 change: 0 additions & 1 deletion mytoyota/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import logging
from typing import List, Optional

import mytoyota.utils.logging.logging_config # noqa # pylint: disable=unused-import
from mytoyota.api import Api
from mytoyota.models.vehicle import Vehicle

Expand Down
3 changes: 1 addition & 2 deletions mytoyota/controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import httpx
import jwt

import mytoyota.utils.logging.logging_config # noqa # pylint: disable=unused-import
from mytoyota.const import (
ACCESS_TOKEN_URL,
API_BASE_URL,
Expand All @@ -24,7 +23,7 @@
ToyotaInvalidUsernameError,
ToyotaLoginError,
)
from mytoyota.utils.logging.log_utils import format_httpx_response
from mytoyota.utils.log_utils import format_httpx_response

_LOGGER: logging.Logger = logging.getLogger(__name__)

Expand Down
6 changes: 1 addition & 5 deletions mytoyota/models/vehicle.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import asyncio
import copy
import json
import logging
from datetime import date
from functools import partial
from itertools import groupby
Expand All @@ -11,7 +10,6 @@

from arrow import Arrow

import mytoyota.utils.logging.logging_config # noqa # pylint: disable=unused-import
from mytoyota.api import Api
from mytoyota.models.dashboard import Dashboard
from mytoyota.models.endpoints.vehicle_guid import VehicleGuidModel
Expand All @@ -22,9 +20,7 @@
from mytoyota.models.summary import Summary, SummaryType
from mytoyota.models.trips import Trip
from mytoyota.utils.helpers import add_with_none
from mytoyota.utils.logging.log_utils import censor_all

_LOGGER: logging.Logger = logging.getLogger(__name__)
from mytoyota.utils.log_utils import censor_all


class Vehicle:
Expand Down
10 changes: 4 additions & 6 deletions mytoyota/utils/conversions.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
"""Conversion utilities used."""
import logging

import mytoyota.utils.logging.logging_config # noqa # pylint: disable=unused-import

_LOGGER: logging.Logger = logging.getLogger(__name__)


def convert_to_miles(kilometers: float) -> float:
"""Convert kilometers to miles."""
_LOGGER.debug(f"Converting {kilometers} to miles...")
_LOGGER.debug("Converting %s kilometers to miles...", kilometers)
return kilometers * 0.621371192


def convert_to_km(miles: float) -> float:
"""Convert kilometers to miles."""
_LOGGER.debug(f"Converting {miles} to kilometers...")
_LOGGER.debug("Converting %s miles to kilometers...", miles)
return miles * 1.60934


Expand All @@ -29,11 +27,11 @@ def convert_distance(convert_to: str, convert_from: str, value: float, decimal_p

def convert_to_liter_per_100_miles(liters: float) -> float:
"""Convert liters per 100 km to liters per 100 miles."""
_LOGGER.debug("Converting to L/100miles...")
_LOGGER.debug("Converting %s liters to L/100miles...", liters)
return round(liters * 1.609344, 4)


def convert_to_mpg(liters_per_100_km: float) -> float:
"""Convert to miles per UK gallon (MPG)."""
_LOGGER.debug("Converting to MPG...")
_LOGGER.debug("Converting %s L/100km to MPG...", liters_per_100_km)
return round(282.5 / liters_per_100_km, 4) if liters_per_100_km > 0.0 else 0.0
File renamed without changes.
31 changes: 0 additions & 31 deletions mytoyota/utils/logging/log_config.yaml

This file was deleted.

24 changes: 0 additions & 24 deletions mytoyota/utils/logging/log_filters.py

This file was deleted.

13 changes: 0 additions & 13 deletions mytoyota/utils/logging/logging_config.py

This file was deleted.

3 changes: 0 additions & 3 deletions simple_client_example.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
"""Simple test of new API Changes."""
import asyncio
import json
import logging
import pprint
from datetime import date, timedelta

import mytoyota.utils.logging.logging_config # noqa # pylint: disable=unused-import
from mytoyota.client import MyT
from mytoyota.models.summary import SummaryType

pp = pprint.PrettyPrinter(indent=4)
_LOGGER = logging.getLogger(__name__)


# Set your username and password in a file on top level called "credentials.json" in the format:
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/test_utils/test_logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import pytest
from httpx import Request, Response

from mytoyota.utils.logging.log_utils import (
from mytoyota.utils.log_utils import (
censor_all,
censor_string,
censor_value,
Expand Down

0 comments on commit 709a8b7

Please sign in to comment.