From 90392ec30358558d603056adb7a5f7c0b861413a Mon Sep 17 00:00:00 2001 From: Ryan Kraus Date: Fri, 3 Jul 2015 03:13:10 -0400 Subject: [PATCH 1/2] Added app name display to Chromecast component. --- homeassistant/components/media_player/cast.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py index 77cdf79a112..b26fa647b00 100644 --- a/homeassistant/components/media_player/cast.py +++ b/homeassistant/components/media_player/cast.py @@ -153,7 +153,8 @@ class CastDevice(MediaPlayerDevice): @property def media_title(self): """ Title of current playing media. """ - return self.media_status.title if self.media_status else None + title = self.media_status.title if self.media_status else None + return title if title else self.cast.app_display_name @property def media_artist(self): From 237778a8bc79f00da8c54485cff0ae74f79d5840 Mon Sep 17 00:00:00 2001 From: Ryan Kraus Date: Tue, 7 Jul 2015 23:04:16 -0400 Subject: [PATCH 2/2] Update to PyISY 1.0.5 Updated Home Assistant to use PyISY version 1.0.5 to fix error when no climate module is present as well as update HTTPS connections to use TLS. --- homeassistant/components/isy994.py | 6 ++++-- requirements.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/isy994.py b/homeassistant/components/isy994.py index 2ff9b5caeaf..d750c3b09be 100644 --- a/homeassistant/components/isy994.py +++ b/homeassistant/components/isy994.py @@ -28,6 +28,7 @@ DISCOVER_SENSORS = "isy994.sensors" ISY = None SENSOR_STRING = 'Sensor' HIDDEN_STRING = '{HIDE ME}' +CONF_TLS_VER = 'tls' # setup logger _LOGGER = logging.getLogger(__name__) @@ -42,7 +43,6 @@ def setup(hass, config): import PyISY except ImportError: _LOGGER.error("Error while importing dependency PyISY.") - return False # pylint: disable=global-statement @@ -74,10 +74,12 @@ def setup(hass, config): global HIDDEN_STRING SENSOR_STRING = str(config[DOMAIN].get('sensor_string', SENSOR_STRING)) HIDDEN_STRING = str(config[DOMAIN].get('hidden_string', HIDDEN_STRING)) + tls_version = config[DOMAIN].get(CONF_TLS_VER, None) # connect to ISY controller global ISY - ISY = PyISY.ISY(addr, port, user, password, use_https=https, log=_LOGGER) + ISY = PyISY.ISY(addr, port, user, password, use_https=https, + tls_ver=tls_version, log=_LOGGER) if not ISY.connected: return False diff --git a/requirements.txt b/requirements.txt index 341fcd3cf81..9f7e788f47c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,7 +39,7 @@ python-nest>=2.3.1 pydispatcher>=2.0.5 # ISY994 bindings (*.isy994) -PyISY>=1.0.2 +PyISY>=1.0.5 # PSutil (sensor.systemmonitor) psutil>=3.0.0