From 31b8e49ad2fca71013d197e34471fef468356fd6 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Thu, 7 Jul 2016 18:54:16 -0700
Subject: [PATCH] Fix PyLint 1.6 issues (#2471)

---
 homeassistant/components/camera/netatmo.py         | 2 +-
 homeassistant/components/frontend/__init__.py      | 2 +-
 homeassistant/components/sensor/tellstick.py       | 2 +-
 homeassistant/components/sensor/thinkingcleaner.py | 2 +-
 homeassistant/components/switch/acer_projector.py  | 2 +-
 homeassistant/components/switch/thinkingcleaner.py | 2 +-
 homeassistant/util/color.py                        | 1 -
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/camera/netatmo.py b/homeassistant/components/camera/netatmo.py
index 752a28f1bbc..8462d4597dd 100644
--- a/homeassistant/components/camera/netatmo.py
+++ b/homeassistant/components/camera/netatmo.py
@@ -89,7 +89,7 @@ class WelcomeData(object):
         """Return all module available on the API as a list."""
         self.update()
         if not self.home:
-            for home in self.welcomedata.cameras.keys():
+            for home in self.welcomedata.cameras:
                 for camera in self.welcomedata.cameras[home].values():
                     self.camera_names.append(camera['name'])
         else:
diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index 2773c90ba19..045d85c71e7 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -1,9 +1,9 @@
 """Handle the frontend for Home Assistant."""
 import os
 
-from . import version, mdi_version
 from homeassistant.components import api
 from homeassistant.components.http import HomeAssistantView
+from . import version, mdi_version
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api']
diff --git a/homeassistant/components/sensor/tellstick.py b/homeassistant/components/sensor/tellstick.py
index 1439dd00ee1..e6caf5bfd96 100644
--- a/homeassistant/components/sensor/tellstick.py
+++ b/homeassistant/components/sensor/tellstick.py
@@ -64,7 +64,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
                 continue
             sensor_name = str(ts_sensor.id)
 
-        for datatype in sensor_value_descriptions.keys():
+        for datatype in sensor_value_descriptions:
             if datatype & datatype_mask and ts_sensor.has_value(datatype):
 
                 sensor_info = sensor_value_descriptions[datatype]
diff --git a/homeassistant/components/sensor/thinkingcleaner.py b/homeassistant/components/sensor/thinkingcleaner.py
index f956ec5037f..3683fb15bf2 100644
--- a/homeassistant/components/sensor/thinkingcleaner.py
+++ b/homeassistant/components/sensor/thinkingcleaner.py
@@ -68,7 +68,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     dev = []
     for device in devices:
-        for type_name in SENSOR_TYPES.keys():
+        for type_name in SENSOR_TYPES:
             dev.append(ThinkingCleanerSensor(device, type_name,
                                              update_devices))
 
diff --git a/homeassistant/components/switch/acer_projector.py b/homeassistant/components/switch/acer_projector.py
index 7a1f3498f18..5fb7fad909d 100644
--- a/homeassistant/components/switch/acer_projector.py
+++ b/homeassistant/components/switch/acer_projector.py
@@ -133,7 +133,7 @@ class AcerSwitch(SwitchDevice):
         else:
             self._available = False
 
-        for key in self._attributes.keys():
+        for key in self._attributes:
             msg = CMD_DICT.get(key, None)
             if msg:
                 awns = self._write_read_format(msg)
diff --git a/homeassistant/components/switch/thinkingcleaner.py b/homeassistant/components/switch/thinkingcleaner.py
index 46adc5a7052..f577b29d2d5 100644
--- a/homeassistant/components/switch/thinkingcleaner.py
+++ b/homeassistant/components/switch/thinkingcleaner.py
@@ -47,7 +47,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     dev = []
     for device in devices:
-        for type_name in SWITCH_TYPES.keys():
+        for type_name in SWITCH_TYPES:
             dev.append(ThinkingCleanerSwitch(device, type_name,
                                              update_devices))
 
diff --git a/homeassistant/util/color.py b/homeassistant/util/color.py
index 646fe7941c3..dd504b57065 100644
--- a/homeassistant/util/color.py
+++ b/homeassistant/util/color.py
@@ -72,7 +72,6 @@ def color_RGB_to_xy(R, G, B):
 # taken from
 # https://github.com/benknight/hue-python-rgb-converter/blob/master/rgb_cie.py
 # Copyright (c) 2014 Benjamin Knight / MIT License.
-# pylint: disable=bad-builtin
 def color_xy_brightness_to_RGB(vX, vY, brightness):
     """Convert from XYZ to RGB."""
     brightness /= 255.