summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpywal/__main__.py8
-rwxr-xr-xpywal/magic.py (renamed from pywal/gen_colors.py)2
-rwxr-xr-xtests/test_magic.py (renamed from tests/test_gen_colors.py)6
3 files changed, 8 insertions, 8 deletions
diff --git a/pywal/__main__.py b/pywal/__main__.py
index 9c1d000..228ceb4 100755
--- a/pywal/__main__.py
+++ b/pywal/__main__.py
@@ -10,11 +10,11 @@ import sys
from pywal.settings import CACHE_DIR, __version__
from pywal import export
from pywal import image
-from pywal import gen_colors
-from pywal import sequences
+from pywal import magic
from pywal import reload
-from pywal import wallpaper
+from pywal import sequences
from pywal import util
+from pywal import wallpaper
def get_args():
@@ -91,7 +91,7 @@ def process_args(args):
image_file = image.get_image(args.i)
# Create a list of hex colors.
- colors_plain = gen_colors.get_colors(image_file, args.q)
+ colors_plain = magic.get_colors(image_file, args.q)
if not args.n:
wallpaper.set_wallpaper(image_file)
diff --git a/pywal/gen_colors.py b/pywal/magic.py
index 3006c72..b435a0a 100755
--- a/pywal/gen_colors.py
+++ b/pywal/magic.py
@@ -1,5 +1,5 @@
"""
-Generate a colorscheme.
+Generate a colorscheme using imagemagick.
"""
import re
import shutil
diff --git a/tests/test_gen_colors.py b/tests/test_magic.py
index 5b407af..673420c 100755
--- a/tests/test_gen_colors.py
+++ b/tests/test_magic.py
@@ -1,7 +1,7 @@
-"""Test gen functions."""
+"""Test imagemagick functions."""
import unittest
-from pywal import gen_colors
+from pywal import magic
class TestGenColors(unittest.TestCase):
@@ -9,7 +9,7 @@ class TestGenColors(unittest.TestCase):
def test_gen_colors(self):
"""> Generate a colorscheme."""
- result = gen_colors.gen_colors("tests/test_files/test.jpg")
+ result = magic.gen_colors("tests/test_files/test.jpg")
self.assertEqual(result[0], "#0F191A")