evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump dep version; add name conf (#5451)

Browse source
This commit is contained in:
happyleavesaoc 2017-01-25 00:36:18 -05:00 • committed by Paulus Schoutsen
parent 59cad0f6ef
commit 3d081c2564
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
homeassistant/components/sensor/usps.py
View file

@ -11,14 +11,15 @@ from datetime import timedelta
import voluptuous as vol import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import CONF_USERNAME, CONF_PASSWORD, ATTR_ATTRIBUTION from homeassistant.const import (CONF_NAME, CONF_USERNAME, CONF_PASSWORD,
ATTR_ATTRIBUTION)
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.util import slugify from homeassistant.util import slugify
from homeassistant.util import Throttle from homeassistant.util import Throttle
from homeassistant.util.dt import now, parse_datetime from homeassistant.util.dt import now, parse_datetime
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
REQUIREMENTS = ['myusps==1.0.1'] REQUIREMENTS = ['myusps==1.0.2']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -30,6 +31,7 @@ STATUS_DELIVERED = 'delivered'
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Required(CONF_USERNAME): cv.string, vol.Required(CONF_USERNAME): cv.string,
vol.Required(CONF_PASSWORD): cv.string, vol.Required(CONF_PASSWORD): cv.string,
vol.Optional(CONF_NAME): cv.string,
vol.Optional(CONF_UPDATE_INTERVAL, default=timedelta(seconds=1800)): ( vol.Optional(CONF_UPDATE_INTERVAL, default=timedelta(seconds=1800)): (
vol.All(cv.time_period, cv.positive_timedelta)), vol.All(cv.time_period, cv.positive_timedelta)),
}) })
@ -48,16 +50,18 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
_LOGGER.exception('Could not connect to My USPS') _LOGGER.exception('Could not connect to My USPS')
return False return False
add_devices([USPSSensor(session, config.get(CONF_UPDATE_INTERVAL))]) add_devices([USPSSensor(session, config.get(CONF_NAME),
config.get(CONF_UPDATE_INTERVAL))])
class USPSSensor(Entity): class USPSSensor(Entity):
"""USPS Sensor.""" """USPS Sensor."""
def __init__(self, session, interval): def __init__(self, session, name, interval):
"""Initialize the sensor.""" """Initialize the sensor."""
import myusps import myusps
self._session = session self._session = session
self._name = name
self._profile = myusps.get_profile(session) self._profile = myusps.get_profile(session)
self._attributes = None self._attributes = None
self._state = None self._state = None
@ -67,7 +71,7 @@ class USPSSensor(Entity):
@property @property
def name(self): def name(self):
"""Return the name of the sensor.""" """Return the name of the sensor."""
return self._profile.get('address') return self._name or self._profile.get('address')
@property @property
def state(self): def state(self):

2
requirements_all.txt
View file

@ -317,7 +317,7 @@ mficlient==0.3.0
miflora==0.1.14 miflora==0.1.14
# homeassistant.components.sensor.usps # homeassistant.components.sensor.usps
myusps==1.0.1 myusps==1.0.2
# homeassistant.components.discovery # homeassistant.components.discovery
netdisco==0.8.1 netdisco==0.8.1