Skip to content

Use string formatting and remove already global disabled pylint issue #6801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabaff merged 1 commit into from
Mar 26, 2017
+19 −23
Merged

Use string formatting and remove already global disabled pylint issue #6801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 19 additions & 23 deletions homeassistant/components/sensor/mvglive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,33 @@
For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/sensor.mvglive/
"""

import logging
from datetime import timedelta

import voluptuous as vol

import homeassistant.helpers.config_validation as cv
from homeassistant.util import Throttle
from homeassistant.helpers.entity import Entity
from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import STATE_UNKNOWN
import homeassistant.helpers.config_validation as cv

_LOGGER = logging.getLogger(__name__)
# A typo in the file name of the PyPI version prevents installation from PyPI
REQUIREMENTS = ["PyMVGLive==1.1.3"]
ICON = 'mdi:bus'
REQUIREMENTS = ['PyMVGLive==1.1.3']

# Return cached results if last scan was less then this time ago.
MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=15)
_LOGGER = logging.getLogger(__name__)

CONF_STATION = 'station'
CONF_BUS = 'bus'
CONF_DEST = 'destination'
CONF_LINE = 'line'
CONF_OFFSET = 'offset'
CONF_UBAHN = 'ubahn'
CONF_TRAM = 'tram'
CONF_BUS = 'bus'
CONF_SBAHN = 'sbahn'
CONF_STATION = 'station'
CONF_TRAM = 'tram'
CONF_UBAHN = 'ubahn'

ICON = 'mdi:bus'

MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=15)

PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_STATION): cv.string,
Expand All @@ -46,7 +45,7 @@


def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup the MVG Live Sensor."""
"""Set up the MVG Live Sensor."""
station = config.get(CONF_STATION)
destination = config.get(CONF_DEST)
line = config.get(CONF_LINE)
Expand All @@ -56,11 +55,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
bus = config.get(CONF_BUS)
sbahn = config.get(CONF_SBAHN)

add_devices([MVGLiveSensor(station, destination, line,
offset, ubahn, tram, bus, sbahn)], True)
add_devices([MVGLiveSensor(
station, destination, line, offset, ubahn, tram, bus, sbahn)], True)


# pylint: disable=too-few-public-methods
class MVGLiveSensor(Entity):
"""Implementation of an MVG Live sensor."""

Expand All @@ -83,9 +81,9 @@ def name(self):
# 'Hauptbahnhof-Marienplatz (S1)'
namestr = self._station
if self._destination:
namestr = namestr + '-' + self._destination
namestr = '{}-{}'.format(namestr, self._destination)
if self._line:
namestr = namestr + ' (' + self._line + ')'
namestr = '{} ({})'.format(namestr, self._line)
return namestr

@property
Expand Down Expand Up @@ -134,11 +132,9 @@ def __init__(self, station, destination, line,
def update(self):
"""Update the connection data."""
try:
_departures = self.mvg.getlivedata(station=self._station,
ubahn=self._ubahn,
tram=self._tram,
bus=self._bus,
sbahn=self._sbahn)
_departures = self.mvg.getlivedata(
station=self._station, ubahn=self._ubahn, tram=self._tram,
bus=self._bus, sbahn=self._sbahn)
except ValueError:
self.nextdeparture = {}
_LOGGER.warning("Returned data not understood.")
Expand Down