jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 14:17:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17041 from home-assistant/rc

Browse Source 
0.79.2
This commit is contained in:
Paulus Schoutsen 2018-10-01 15:50:25 +02:00 committed by GitHub
commit 122e21a3c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/components/mqtt/__init__.py
View File

@ -424,25 +424,22 @@ async def async_setup_entry(hass, entry):
keepalive = conf[CONF_KEEPALIVE] keepalive = conf[CONF_KEEPALIVE]
username = conf.get(CONF_USERNAME) username = conf.get(CONF_USERNAME)
password = conf.get(CONF_PASSWORD) password = conf.get(CONF_PASSWORD)
certificate = conf.get(CONF_CERTIFICATE)
client_key = conf.get(CONF_CLIENT_KEY) client_key = conf.get(CONF_CLIENT_KEY)
client_cert = conf.get(CONF_CLIENT_CERT) client_cert = conf.get(CONF_CLIENT_CERT)
tls_insecure = conf.get(CONF_TLS_INSECURE) tls_insecure = conf.get(CONF_TLS_INSECURE)
protocol = conf[CONF_PROTOCOL] protocol = conf[CONF_PROTOCOL]
# For cloudmqtt.com, secured connection, auto fill in certificate # For cloudmqtt.com, secured connection, auto fill in certificate
if (conf.get(CONF_CERTIFICATE) is None and if (certificate is None and 19999 < conf[CONF_PORT] < 30000 and
19999 < conf[CONF_PORT] < 30000 and broker.endswith('.cloudmqtt.com')):
conf[CONF_BROKER].endswith('.cloudmqtt.com')):
certificate = os.path.join( certificate = os.path.join(
os.path.dirname(__file__), 'addtrustexternalcaroot.crt') os.path.dirname(__file__), 'addtrustexternalcaroot.crt')
# When the certificate is set to auto, use bundled certs from requests # When the certificate is set to auto, use bundled certs from requests
elif conf.get(CONF_CERTIFICATE) == 'auto': elif certificate == 'auto':
certificate = requests.certs.where() certificate = requests.certs.where()
else:
certificate = None
if CONF_WILL_MESSAGE in conf: if CONF_WILL_MESSAGE in conf:
will_message = Message(**conf[CONF_WILL_MESSAGE]) will_message = Message(**conf[CONF_WILL_MESSAGE])
else: else:

2
homeassistant/components/switch/zoneminder.py
View File

@ -57,7 +57,7 @@ class ZMSwitchMonitors(SwitchDevice):
@property @property
def name(self): def name(self):
"""Return the name of the switch.""" """Return the name of the switch."""
return '{}\'s State'.format(self._monitor.name) return '{} State'.format(self._monitor.name)
def update(self): def update(self):
"""Update the switch value.""" """Update the switch value."""

2
homeassistant/const.py
View File

@ -2,7 +2,7 @@
"""Constants used by Home Assistant components.""" """Constants used by Home Assistant components."""
MAJOR_VERSION = 0 MAJOR_VERSION = 0
MINOR_VERSION = 79 MINOR_VERSION = 79
PATCH_VERSION = '1' PATCH_VERSION = '2'
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION) __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION) __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
REQUIRED_PYTHON_VER = (3, 5, 3) REQUIRED_PYTHON_VER = (3, 5, 3)