tests: Fix linting and tests.

2 files changed, 20 insertions, 15 deletions

diff --git a/pywal/export_colors.py b/pywal/export_colors.py
index 036b661..64dc2a7 100755
--- a/pywal/export_colors.py
+++ b/pywal/export_colors.py
@@ -31,13 +31,14 @@ def export_all_templates(colors, template_dir=None, output_dir=CACHE_DIR):
     """Export all template files."""
 
     # Add the template dir to module path.
-    template_dir = template_dir or os.path.join(os.path.dirname(__file__), "templates")
+    template_dir = template_dir or \
+        os.path.join(os.path.dirname(__file__), "templates")
 
     # Merge all colors (specials and normals) into one dict so we can access
     # their values simpler.
-    all_colors = dict()
-    for v in colors.values():
-        all_colors.update(v)
+    all_colors = {}
+    # pylint: disable=W0106
+    [all_colors.update(value) for value in colors.values()]
 
     # Turn all those colors into util.Color instances for accessing the
     # .hex and .rgb formats
diff --git a/pywal/util.py b/pywal/util.py
index 820be10..0b4977b 100755
--- a/pywal/util.py
+++ b/pywal/util.py
@@ -7,6 +7,21 @@ import pathlib
 import subprocess
 
 
+# pylint: disable=too-few-public-methods
+class Color(object):
+    """Color formats."""
+    def __init__(self, hex_color):
+        self.hex_color = hex_color
+
+    def __str__(self):
+        return self.hex_color
+
+    @property
+    def rgb(self):
+        """Convert a hex color to rgb."""
+        return hex_to_rgb(self.hex_color)
+
+
 def read_file(input_file):
     """Read colors from a file."""
     with open(input_file) as file:
@@ -51,14 +66,3 @@ def disown(*cmd):
                      stdout=subprocess.DEVNULL,
                      stderr=subprocess.DEVNULL,
                      preexec_fn=os.setpgrp)
-
-class Color(object):
-    def __init__(self, hex):
-        self.hex = hex
-
-    def __str__(self):
-        return self.hex
-
-    @property
-    def rgb(self):
-        return hex_to_rgb(self.hex)