From 1be2706de3a2e55e3df50741b27638eb9964af24 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Mar 2017 21:42:00 +0100
Subject: [PATCH] Upgrade pydroid-ipcam to 0.7 (#6772)

---
 homeassistant/components/android_ip_webcam.py | 38 +++++++++----------
 requirements_all.txt                          |  2 +-
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/homeassistant/components/android_ip_webcam.py b/homeassistant/components/android_ip_webcam.py
index e2929d159da..7699242e478 100644
--- a/homeassistant/components/android_ip_webcam.py
+++ b/homeassistant/components/android_ip_webcam.py
@@ -26,17 +26,24 @@ from homeassistant.util.dt import utcnow
 from homeassistant.components.camera.mjpeg import (
     CONF_MJPEG_URL, CONF_STILL_IMAGE_URL)
 
-DOMAIN = 'android_ip_webcam'
-REQUIREMENTS = ["pydroid-ipcam==0.6"]
+REQUIREMENTS = ['pydroid-ipcam==0.7']
 
 _LOGGER = logging.getLogger(__name__)
-SCAN_INTERVAL = timedelta(seconds=10)
-
-DATA_IP_WEBCAM = 'android_ip_webcam'
 
+ATTR_AUD_CONNS = 'Audio Connections'
 ATTR_HOST = 'host'
 ATTR_VID_CONNS = 'Video Connections'
-ATTR_AUD_CONNS = 'Audio Connections'
+
+CONF_MOTION_SENSOR = 'motion_sensor'
+
+DATA_IP_WEBCAM = 'android_ip_webcam'
+DEFAULT_NAME = 'IP Webcam'
+DEFAULT_PORT = 8080
+DEFAULT_TIMEOUT = 10
+DOMAIN = 'android_ip_webcam'
+
+SCAN_INTERVAL = timedelta(seconds=10)
+SIGNAL_UPDATE_DATA = 'android_ip_webcam_update'
 
 KEY_MAP = {
     'audio_connections': 'Audio Connections',
@@ -123,15 +130,6 @@ SENSORS = ['audio_connections', 'battery_level', 'battery_temp',
            'battery_voltage', 'light', 'motion', 'pressure', 'proximity',
            'sound', 'video_connections']
 
-SIGNAL_UPDATE_DATA = 'android_ip_webcam_update'
-
-CONF_MOTION_SENSOR = 'motion_sensor'
-
-DEFAULT_NAME = 'IP Webcam'
-DEFAULT_PORT = 8080
-DEFAULT_TIMEOUT = 10
-
-
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.All(cv.ensure_list, [vol.Schema({
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@@ -153,7 +151,7 @@ CONFIG_SCHEMA = vol.Schema({
 
 @asyncio.coroutine
 def async_setup(hass, config):
-    """Setup the IP Webcam component."""
+    """Set up the IP Webcam component."""
     from pydroid_ipcam import PyDroidIPCam
 
     webcams = hass.data[DATA_IP_WEBCAM] = {}
@@ -161,7 +159,7 @@ def async_setup(hass, config):
 
     @asyncio.coroutine
     def async_setup_ipcamera(cam_config):
-        """Setup a ip camera."""
+        """Set up an IP camera."""
         host = cam_config[CONF_HOST]
         username = cam_config.get(CONF_USERNAME)
         password = cam_config.get(CONF_PASSWORD)
@@ -171,7 +169,7 @@ def async_setup(hass, config):
         sensors = cam_config[CONF_SENSORS]
         motion = cam_config[CONF_MOTION_SENSOR]
 
-        # init ip webcam
+        # Init ip webcam
         cam = PyDroidIPCam(
             hass.loop, websession, host, cam_config[CONF_PORT],
             username=username, password=password,
@@ -192,7 +190,7 @@ def async_setup(hass, config):
 
         @asyncio.coroutine
         def async_update_data(now):
-            """Update data from ipcam in SCAN_INTERVAL."""
+            """Update data from IP camera in SCAN_INTERVAL."""
             yield from cam.update()
             async_dispatcher_send(hass, SIGNAL_UPDATE_DATA, host)
 
@@ -201,7 +199,7 @@ def async_setup(hass, config):
 
         yield from async_update_data(None)
 
-        # load platforms
+        # Load platforms
         webcams[host] = cam
 
         mjpeg_camera = {
diff --git a/requirements_all.txt b/requirements_all.txt
index 0c41139c3f4..b6d4034b919 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -490,7 +490,7 @@ pycmus==0.1.0
 pydispatcher==2.0.5
 
 # homeassistant.components.android_ip_webcam
-pydroid-ipcam==0.6
+pydroid-ipcam==0.7
 
 # homeassistant.components.sensor.ebox
 pyebox==0.1.0