From bf2b06880e76be2525486b281d07857c4672466e Mon Sep 17 00:00:00 2001
From: jamespcole <james@inoutput.io>
Date: Fri, 10 Jul 2015 20:10:23 +1000
Subject: [PATCH] Fixed some linting errors

---
 homeassistant/components/camera/__init__.py | 6 ++----
 homeassistant/components/camera/generic.py  | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index 3948c1cfb57..200e48f4862 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -33,8 +33,6 @@ from homeassistant.const import (
     ATTR_ENTITY_PICTURE,
     HTTP_NOT_FOUND,
     ATTR_ENTITY_ID,
-    HTTP_HEADER_CONTENT_TYPE,
-    CONTENT_TYPE_MULTIPART
     )
 
 from homeassistant.helpers.entity_component import EntityComponent
@@ -130,8 +128,8 @@ def setup(hass, config):
             camera = component.entities[entity_id]
 
         if not camera:
-            self.handler.send_response(HTTP_NOT_FOUND)
-            self.handler.end_headers()
+            handler.send_response(HTTP_NOT_FOUND)
+            handler.end_headers()
             return
 
         try:
diff --git a/homeassistant/components/camera/generic.py b/homeassistant/components/camera/generic.py
index d7e5bf8a2f6..fa5ac31b9b7 100644
--- a/homeassistant/components/camera/generic.py
+++ b/homeassistant/components/camera/generic.py
@@ -156,14 +156,17 @@ class GenericCamera(Camera):
 
     @property
     def base_url(self):
+        """ Return the URL of the IP Camera """
         return self._base_url
 
     @property
     def username(self):
+        """ Return the configured username """
         return self._username
 
     @property
     def password(self):
+        """ Return the configured password """
         return self._password
 
     @property