Use constants for HTTP headers (#10313)
* Use constants for HTTP headers * Fix ordering * Move 'no-cache' to platform
This commit is contained in:
1 parent
e64803e701
commit
de9d19d6f4
36 files changed
+408
-444
No files matched your search
@@ -7,24 +7,28 @@ https://home-assistant.io/components/sensor.haveibeenpwned/
|
||||
from datetime import timedelta
|
||||
import logging
|
||||
|
||||
import voluptuous as vol
|
||||
from aiohttp.hdrs import USER_AGENT
|
||||
import requests
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.const import (STATE_UNKNOWN, CONF_EMAIL)
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.const import CONF_EMAIL
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.helpers.event import track_point_in_time
|
||||
from homeassistant.util import Throttle
|
||||
import homeassistant.util.dt as dt_util
|
||||
from homeassistant.helpers.event import track_point_in_time
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
DATE_STR_FORMAT = "%Y-%m-%d %H:%M:%S"
|
||||
USER_AGENT = "Home Assistant HaveIBeenPwned Sensor Component"
|
||||
|
||||
MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
|
||||
HA_USER_AGENT = "Home Assistant HaveIBeenPwned Sensor Component"
|
||||
|
||||
MIN_TIME_BETWEEN_FORCED_UPDATES = timedelta(seconds=5)
|
||||
MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
|
||||
|
||||
URL = 'https://haveibeenpwned.com/api/v2/breachedaccount/'
|
||||
|
||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
|
||||
vol.Required(CONF_EMAIL): vol.All(cv.ensure_list, [cv.string]),
|
||||
@@ -33,7 +37,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
|
||||
|
||||
# pylint: disable=unused-argument
|
||||
def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
"""Set up the HaveIBeenPwnedSensor sensor."""
|
||||
"""Set up the HaveIBeenPwned sensor."""
|
||||
emails = config.get(CONF_EMAIL)
|
||||
data = HaveIBeenPwnedData(emails)
|
||||
|
||||
@@ -50,11 +54,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
|
||||
|
||||
class HaveIBeenPwnedSensor(Entity):
|
||||
"""Implementation of a HaveIBeenPwnedSensor."""
|
||||
"""Implementation of a HaveIBeenPwned sensor."""
|
||||
|
||||
def __init__(self, data, hass, email):
|
||||
"""Initialize the HaveIBeenPwnedSensor sensor."""
|
||||
self._state = STATE_UNKNOWN
|
||||
"""Initialize the HaveIBeenPwned sensor."""
|
||||
self._state = None
|
||||
self._data = data
|
||||
self._hass = hass
|
||||
self._email = email
|
||||
@@ -77,7 +81,7 @@ class HaveIBeenPwnedSensor(Entity):
|
||||
|
||||
@property
|
||||
def device_state_attributes(self):
|
||||
"""Return the atrributes of the sensor."""
|
||||
"""Return the attributes of the sensor."""
|
||||
val = {}
|
||||
if self._email not in self._data.data:
|
||||
return val
|
||||
@@ -143,17 +147,16 @@ class HaveIBeenPwnedData(object):
|
||||
def update(self, **kwargs):
|
||||
"""Get the latest data for current email from REST service."""
|
||||
try:
|
||||
url = "https://haveibeenpwned.com/api/v2/breachedaccount/{}". \
|
||||
format(self._email)
|
||||
url = "{}{}".format(URL, self._email)
|
||||
|
||||
_LOGGER.info("Checking for breaches for email %s", self._email)
|
||||
_LOGGER.debug("Checking for breaches for email: %s", self._email)
|
||||
|
||||
req = requests.get(url, headers={"User-agent": USER_AGENT},
|
||||
allow_redirects=True, timeout=5)
|
||||
req = requests.get(
|
||||
url, headers={USER_AGENT: HA_USER_AGENT}, allow_redirects=True,
|
||||
timeout=5)
|
||||
|
||||
except requests.exceptions.RequestException:
|
||||
_LOGGER.error("Failed fetching HaveIBeenPwned Data for %s",
|
||||
self._email)
|
||||
_LOGGER.error("Failed fetching data for %s", self._email)
|
||||
return
|
||||
|
||||
if req.status_code == 200:
|
||||
@@ -161,7 +164,7 @@ class HaveIBeenPwnedData(object):
|
||||
key=lambda k: k["AddedDate"],
|
||||
reverse=True)
|
||||
|
||||
# only goto next email if we had data so that
|
||||
# Only goto next email if we had data so that
|
||||
# the forced updates try this current email again
|
||||
self.set_next_email()
|
||||
|
||||
@@ -173,6 +176,6 @@ class HaveIBeenPwnedData(object):
|
||||
self.set_next_email()
|
||||
|
||||
else:
|
||||
_LOGGER.error("Failed fetching HaveIBeenPwned Data for %s"
|
||||
_LOGGER.error("Failed fetching data for %s"
|
||||
"(HTTP Status_code = %d)", self._email,
|
||||
req.status_code)
|
||||
@@ -4,19 +4,20 @@ Support for monitoring NZBGet NZB client.
|
||||
For more details about this platform, please refer to the documentation at
|
||||
https://home-assistant.io/components/sensor.nzbget/
|
||||
"""
|
||||
import logging
|
||||
from datetime import timedelta
|
||||
import logging
|
||||
|
||||
from aiohttp.hdrs import CONTENT_TYPE
|
||||
import requests
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.const import (
|
||||
CONF_HOST, CONF_PASSWORD, CONF_USERNAME, CONF_NAME, CONF_PORT,
|
||||
CONF_SSL, CONTENT_TYPE_JSON, CONF_MONITORED_VARIABLES)
|
||||
CONF_SSL, CONF_HOST, CONF_NAME, CONF_PORT, CONF_PASSWORD, CONF_USERNAME,
|
||||
CONTENT_TYPE_JSON, CONF_MONITORED_VARIABLES)
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.util import Throttle
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
@@ -145,7 +146,7 @@ class NZBGetAPI(object):
|
||||
"""Initialize NZBGet API and set headers needed later."""
|
||||
self.api_url = api_url
|
||||
self.status = None
|
||||
self.headers = {'content-type': CONTENT_TYPE_JSON}
|
||||
self.headers = {CONTENT_TYPE: CONTENT_TYPE_JSON}
|
||||
|
||||
if username is not None and password is not None:
|
||||
self.auth = (username, password)
|
||||
@@ -155,7 +156,7 @@ class NZBGetAPI(object):
|
||||
|
||||
def post(self, method, params=None):
|
||||
"""Send a POST request and return the response as a dict."""
|
||||
payload = {"method": method}
|
||||
payload = {'method': method}
|
||||
|
||||
if params:
|
||||
payload['params'] = params
|
||||
|
||||
@@ -4,18 +4,18 @@ Support for monitoring pyLoad.
|
||||
For more details about this platform, please refer to the documentation at
|
||||
https://home-assistant.io/components/sensor.pyload/
|
||||
"""
|
||||
import logging
|
||||
from datetime import timedelta
|
||||
import logging
|
||||
|
||||
from aiohttp.hdrs import CONTENT_TYPE
|
||||
import requests
|
||||
import voluptuous as vol
|
||||
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.const import (
|
||||
CONF_HOST, CONF_PASSWORD, CONF_USERNAME, CONF_NAME, CONF_PORT,
|
||||
CONF_SSL, HTTP_HEADER_CONTENT_TYPE, CONTENT_TYPE_JSON,
|
||||
CONF_MONITORED_VARIABLES)
|
||||
CONF_SSL, CONF_HOST, CONF_NAME, CONF_PORT, CONF_PASSWORD, CONF_USERNAME,
|
||||
CONTENT_TYPE_JSON, CONF_MONITORED_VARIABLES)
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.util import Throttle
|
||||
|
||||
@@ -132,7 +132,7 @@ class PyLoadAPI(object):
|
||||
"""Initialize pyLoad API and set headers needed later."""
|
||||
self.api_url = api_url
|
||||
self.status = None
|
||||
self.headers = {HTTP_HEADER_CONTENT_TYPE: CONTENT_TYPE_JSON}
|
||||
self.headers = {CONTENT_TYPE: CONTENT_TYPE_JSON}
|
||||
|
||||
if username is not None and password is not None:
|
||||
self.payload = {'username': username, 'password': password}
|
||||
|
||||
@@ -8,15 +8,16 @@ import asyncio
|
||||
import logging
|
||||
|
||||
import aiohttp
|
||||
from aiohttp.hdrs import ACCEPT, AUTHORIZATION
|
||||
import async_timeout
|
||||
import voluptuous as vol
|
||||
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.components.sensor import PLATFORM_SCHEMA
|
||||
from homeassistant.components.thethingsnetwork import (
|
||||
DATA_TTN, TTN_APP_ID, TTN_ACCESS_KEY, TTN_DATA_STORAGE_URL)
|
||||
from homeassistant.const import CONTENT_TYPE_JSON
|
||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.entity import Entity
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
@@ -122,8 +123,8 @@ class TtnDataStorage(object):
|
||||
self._url = TTN_DATA_STORAGE_URL.format(
|
||||
app_id=app_id, endpoint='api/v2/query', device_id=device_id)
|
||||
self._headers = {
|
||||
'Accept': CONTENT_TYPE_JSON,
|
||||
'Authorization': 'key {}'.format(access_key),
|
||||
ACCEPT: CONTENT_TYPE_JSON,
|
||||
AUTHORIZATION: 'key {}'.format(access_key),
|
||||
}
|
||||
|
||||
@asyncio.coroutine
|
||||
|
||||
@@ -5,24 +5,25 @@ For more details about this platform, please refer to the documentation at
|
||||
https://home-assistant.io/components/sensor.zamg/
|
||||
"""
|
||||
import csv
|
||||
from datetime import datetime, timedelta
|
||||
import gzip
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from aiohttp.hdrs import USER_AGENT
|
||||
import pytz
|
||||
import requests
|
||||
import voluptuous as vol
|
||||
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.components.weather import (
|
||||
ATTR_WEATHER_HUMIDITY, ATTR_WEATHER_ATTRIBUTION, ATTR_WEATHER_PRESSURE,
|
||||
ATTR_WEATHER_TEMPERATURE, ATTR_WEATHER_WIND_BEARING,
|
||||
ATTR_WEATHER_WIND_SPEED)
|
||||
ATTR_WEATHER_HUMIDITY, ATTR_WEATHER_PRESSURE, ATTR_WEATHER_WIND_SPEED,
|
||||
ATTR_WEATHER_ATTRIBUTION, ATTR_WEATHER_TEMPERATURE,
|
||||
ATTR_WEATHER_WIND_BEARING)
|
||||
from homeassistant.const import (
|
||||
CONF_MONITORED_CONDITIONS, CONF_NAME, __version__,
|
||||
CONF_LATITUDE, CONF_LONGITUDE)
|
||||
CONF_NAME, CONF_LATITUDE, CONF_LONGITUDE, CONF_MONITORED_CONDITIONS,
|
||||
__version__)
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.helpers.entity import Entity
|
||||
from homeassistant.util import Throttle
|
||||
|
||||
@@ -30,13 +31,12 @@ _LOGGER = logging.getLogger(__name__)
|
||||
|
||||
ATTR_STATION = 'station'
|
||||
ATTR_UPDATED = 'updated'
|
||||
ATTRIBUTION = 'Data provided by ZAMG'
|
||||
ATTRIBUTION = "Data provided by ZAMG"
|
||||
|
||||
CONF_STATION_ID = 'station_id'
|
||||
|
||||
DEFAULT_NAME = 'zamg'
|
||||
|
||||
# Data source updates once per hour, so we do nothing if it's been less time
|
||||
MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=10)
|
||||
|
||||
SENSOR_TYPES = {
|
||||
@@ -138,7 +138,7 @@ class ZamgData(object):
|
||||
|
||||
API_URL = 'http://www.zamg.ac.at/ogd/'
|
||||
API_HEADERS = {
|
||||
'User-Agent': '{} {}'.format('home-assistant.zamg/', __version__),
|
||||
USER_AGENT: '{} {}'.format('home-assistant.zamg/', __version__),
|
||||
}
|
||||
|
||||
def __init__(self, station_id):
|
||||
@@ -162,8 +162,8 @@ class ZamgData(object):
|
||||
cls.API_URL, headers=cls.API_HEADERS, timeout=15)
|
||||
response.raise_for_status()
|
||||
response.encoding = 'UTF8'
|
||||
return csv.DictReader(response.text.splitlines(),
|
||||
delimiter=';', quotechar='"')
|
||||
return csv.DictReader(
|
||||
response.text.splitlines(), delimiter=';', quotechar='"')
|
||||
except requests.exceptions.HTTPError:
|
||||
_LOGGER.error("While fetching data")
|
||||
|
||||
|
||||
Reference in new issue
Block a user