general: Fixes.

pywal/wal.py

@@ -4,11 +4,11 @@ Created by Dylan Araps.
 """
 import pathlib
 
-from pywal import export
 from pywal import image
 from pywal import magic
 from pywal import reload
 from pywal import sequences
+from pywal import template
 from pywal import wallpaper
 
 
@@ -42,7 +42,7 @@ def reload_env(cache_dir=CACHE_DIR):
 
 def export_all_templates(colors, output_dir=CACHE_DIR, template_dir=None):
     """Export all templates."""
-    export.export_all_templates(colors, output_dir, template_dir)
+    template.export_all_templates(colors, output_dir, template_dir)
 
 
 def set_wallpaper(img):

tests/test_files/test2.jpg

@@ -0,0 +1 @@
+test.jpg

tests/test_image.py

@@ -14,7 +14,7 @@ class TestImage(unittest.TestCase):
     def test_get_img_dir(self):
         """> Validate image directory."""
         result = wal.get_image("tests/test_files")
-        self.assertEqual(result, "tests/test_files/test.jpg")
+        self.assertEqual(result, "tests/test_files/test2.jpg")
 
 
 if __name__ == "__main__":

tests/test_magic.py

@@ -10,7 +10,7 @@ class TestGenColors(unittest.TestCase):
     def test_gen_colors(self):
         """> Generate a colorscheme."""
         result = wal.create_palette("tests/test_files/test.jpg")
-        self.assertEqual(result[0], "#0F191A")
+        self.assertEqual(result["colors"]["color0"], "#0F191A")
 
 
 if __name__ == "__main__":

tests/test_template.py

@@ -2,7 +2,7 @@
 import unittest
 import pathlib
 
-from pywal import export
+from pywal import template
 from pywal import util
 
 
@@ -21,7 +21,7 @@ class TestExportColors(unittest.TestCase):
 
         output_dir = pathlib.Path("/tmp")
         template_dir = pathlib.Path("tests/test_files/templates")
-        export.export_all_templates(COLORS, template_dir, output_dir)
+        template.export_all_templates(COLORS, output_dir, template_dir)
 
         result = pathlib.Path("/tmp/test_template").is_file()
         self.assertTrue(result)