From 7a4d40a8fdf0f8586acf6919caae01e92ad6e3c6 Mon Sep 17 00:00:00 2001
From: jamespcole <james@inoutput.io>
Date: Fri, 5 Jun 2015 23:04:52 +1000
Subject: [PATCH] Fixed some linting errors

---
 homeassistant/components/camera/__init__.py | 10 ++++++++++
 homeassistant/components/camera/generic.py  |  1 +
 2 files changed, 11 insertions(+)

diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index b35b64a3c51..92e8f3d2b4f 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -179,11 +179,13 @@ class Camera(Entity):
     """ The base class for camera components """
 
     @property
+    # pylint: disable=no-self-use
     def is_recording(self):
         """ Returns true if the device is recording """
         return False
 
     @property
+    # pylint: disable=no-self-use
     def is_streaming(self):
         """ Returns true if the device is streaming """
         return False
@@ -194,41 +196,49 @@ class Camera(Entity):
         pass
 
     @property
+    # pylint: disable=no-self-use
     def brand(self):
         """ Should return a string of the camera brand """
         return None
 
     @property
+    # pylint: disable=no-self-use
     def model(self):
         """ Returns string of camera model """
         return None
 
     @property
+    # pylint: disable=no-self-use
     def base_url(self):
         """ Return the configured base URL for the camera """
         return None
 
     @property
+    # pylint: disable=no-self-use
     def image_url(self):
         """ Return the still image segment of the URL """
         return None
 
     @property
+    # pylint: disable=no-self-use
     def device_info(self):
         """ Get the configuration object """
         return None
 
     @property
+    # pylint: disable=no-self-use
     def username(self):
         """ Get the configured username """
         return None
 
     @property
+    # pylint: disable=no-self-use
     def password(self):
         """ Get the configured password """
         return None
 
     @property
+    # pylint: disable=no-self-use
     def still_image_url(self):
         """ Get the URL of a camera still image """
         return None
diff --git a/homeassistant/components/camera/generic.py b/homeassistant/components/camera/generic.py
index 8c7e3d72588..ab09126568d 100644
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -165,6 +165,7 @@ class GenericCamera(Camera):
         return self._is_streaming
 
     @is_streaming.setter
+    # pylint: disable=arguments-differ
     def is_streaming(self, value):
         self._is_streaming = value