From cd5b5c55e28778365e980806dc718d13815eee1e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 7 Mar 2016 20:29:54 +0100
Subject: [PATCH] Fix PEP257 issues

---
 homeassistant/components/camera/__init__.py | 3 ++-
 homeassistant/components/camera/bloomsky.py | 7 ++++---
 homeassistant/components/camera/demo.py     | 2 ++
 homeassistant/components/camera/foscam.py   | 2 ++
 homeassistant/components/camera/generic.py  | 6 +++---
 homeassistant/components/camera/mjpeg.py    | 5 ++---
 homeassistant/components/camera/uvc.py      | 2 ++
 7 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index 0fc93cfc75c..41860a62cb7 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -42,7 +42,7 @@ MJPEG_START_HEADER = 'Content-type: {0}\r\n\r\n'
 
 # pylint: disable=too-many-branches
 def setup(hass, config):
-    """Initialize camera component."""
+    """Setup the camera component."""
     component = EntityComponent(
         logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL,
         DISCOVERY_PLATFORMS)
@@ -121,6 +121,7 @@ def setup(hass, config):
 
 class Camera(Entity):
     """The base class for camera entities."""
+
     def __init__(self):
         """Initialize a camera."""
         self.is_streaming = False
diff --git a/homeassistant/components/camera/bloomsky.py b/homeassistant/components/camera/bloomsky.py
index feb8b498d26..cd40b91a21c 100644
--- a/homeassistant/components/camera/bloomsky.py
+++ b/homeassistant/components/camera/bloomsky.py
@@ -23,9 +23,10 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
 
 
 class BloomSkyCamera(Camera):
-    """Represents the images published from the BloomSky's camera."""
+    """Representation of the images published from the BloomSky's camera."""
+
     def __init__(self, bs, device):
-        """ set up for access to the BloomSky camera images """
+        """Setup for access to the BloomSky camera images."""
         super(BloomSkyCamera, self).__init__()
         self._name = device["DeviceName"]
         self._id = device["DeviceID"]
@@ -56,5 +57,5 @@ class BloomSkyCamera(Camera):
 
     @property
     def name(self):
-        """The name of this BloomSky device."""
+        """Return the name of this BloomSky device."""
         return self._name
diff --git a/homeassistant/components/camera/demo.py b/homeassistant/components/camera/demo.py
index 0da0a6d195b..e3ab0d6b059 100644
--- a/homeassistant/components/camera/demo.py
+++ b/homeassistant/components/camera/demo.py
@@ -19,7 +19,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
 class DemoCamera(Camera):
     """A Demo camera."""
+
     def __init__(self, name):
+        """Initialize demo camera component."""
         super().__init__()
         self._name = name
 
diff --git a/homeassistant/components/camera/foscam.py b/homeassistant/components/camera/foscam.py
index 7580823390c..f8ba7dfe27d 100644
--- a/homeassistant/components/camera/foscam.py
+++ b/homeassistant/components/camera/foscam.py
@@ -27,7 +27,9 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
 # pylint: disable=too-many-instance-attributes
 class FoscamCamera(Camera):
     """An implementation of a Foscam IP camera."""
+
     def __init__(self, device_info):
+        """Initialize a Foscam camera."""
         super(FoscamCamera, self).__init__()
 
         ip_address = device_info.get('ip')
diff --git a/homeassistant/components/camera/generic.py b/homeassistant/components/camera/generic.py
index c563c23c67b..bad0e3af6d9 100644
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -27,10 +27,10 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
 
 # pylint: disable=too-many-instance-attributes
 class GenericCamera(Camera):
-    """
-    A generic implementation of an IP camera that is reachable over a URL.
-    """
+    """A generic implementation of an IP camera."""
+
     def __init__(self, device_info):
+        """Initialize a generic camera."""
         super().__init__()
         self._name = device_info.get('name', 'Generic Camera')
         self._username = device_info.get('username')
diff --git a/homeassistant/components/camera/mjpeg.py b/homeassistant/components/camera/mjpeg.py
index 15710938fdb..9d5c9d96b92 100644
--- a/homeassistant/components/camera/mjpeg.py
+++ b/homeassistant/components/camera/mjpeg.py
@@ -31,11 +31,10 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
 
 # pylint: disable=too-many-instance-attributes
 class MjpegCamera(Camera):
-    """
-    A generic implementation of an IP camera that is reachable over a URL.
-    """
+    """An implementation of an IP camera that is reachable over a URL."""
 
     def __init__(self, device_info):
+        """Initialize a MJPEG camera."""
         super().__init__()
         self._name = device_info.get('name', 'Mjpeg Camera')
         self._username = device_info.get('username')
diff --git a/homeassistant/components/camera/uvc.py b/homeassistant/components/camera/uvc.py
index 2d0f931caf8..0aaf147e4fb 100644
--- a/homeassistant/components/camera/uvc.py
+++ b/homeassistant/components/camera/uvc.py
@@ -59,7 +59,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
 class UnifiVideoCamera(Camera):
     """A Ubiquiti Unifi Video Camera."""
+
     def __init__(self, nvr, uuid, name):
+        """Initialize an Unifi camera."""
         super(UnifiVideoCamera, self).__init__()
         self._nvr = nvr
         self._uuid = uuid