diff --git a/pywal/export_colors.py b/pywal/export_colors.py index 93028aa..3a89d22 100755 --- a/pywal/export_colors.py +++ b/pywal/export_colors.py @@ -6,7 +6,7 @@ import subprocess from pywal.settings import CACHE_DIR from pywal import util -from pywal import format_color +from pywal import format_colors def save_colors(colors, export_file, message): @@ -30,25 +30,25 @@ def reload_i3(): def export_colors(colors): """Export colors in various formats.""" - plain_colors = format_color.plain(colors) + plain_colors = format_colors.plain(colors) save_colors(plain_colors, "colors", "plain hex colors") # Shell based colors. - shell_colors = format_color.shell(colors) + shell_colors = format_colors.shell(colors) save_colors(shell_colors, "colors.sh", "shell variables") # Web based colors. - css_colors = format_color.css(colors) + css_colors = format_colors.css(colors) save_colors(css_colors, "colors.css", "css variables") - scss_colors = format_color.scss(colors) + scss_colors = format_colors.scss(colors) save_colors(scss_colors, "colors.scss", "scss variables") # Text editor based colors. - putty_colors = format_color.putty(colors) + putty_colors = format_colors.putty(colors) save_colors(putty_colors, "colors-putty.reg", "putty theme") # X based colors. - xrdb_colors = format_color.xrdb(colors) + xrdb_colors = format_colors.xrdb(colors) save_colors(xrdb_colors, "xcolors", "xrdb colors") # i3 colors. diff --git a/pywal/format_color.py b/pywal/format_colors.py similarity index 100% rename from pywal/format_color.py rename to pywal/format_colors.py diff --git a/tests/test_format_colors.py b/tests/test_format_colors.py index 63c1ce2..ab5946a 100755 --- a/tests/test_format_colors.py +++ b/tests/test_format_colors.py @@ -1,7 +1,7 @@ """Test format functions.""" import unittest -from pywal import format_color +from pywal import format_colors from pywal import util @@ -14,32 +14,32 @@ class TestFormatColors(unittest.TestCase): def test_plain(self): """> Convert colors to plain.""" - result = format_color.plain(COLORS) + result = format_colors.plain(COLORS) self.assertEqual(result[0], "#363442\n") def test_shell(self): """> Convert colors to shell variables.""" - result = format_color.shell(COLORS) + result = format_colors.shell(COLORS) self.assertEqual(result[0], "color0='#363442'\n") def test_css(self): """> Convert colors to css variables.""" - result = format_color.css(COLORS) + result = format_colors.css(COLORS) self.assertEqual(result[1], "\t--color0: #363442;\n") def test_scss(self): """> Convert colors to scss variables.""" - result = format_color.scss(COLORS) + result = format_colors.scss(COLORS) self.assertEqual(result[0], "$color0: #363442;\n") def test_putty(self): """> Convert colors to putty theme.""" - result = format_color.putty(COLORS) + result = format_colors.putty(COLORS) self.assertEqual(result[2], "\"colour0\"=\"54,52,66\"\n") def test_xrdb(self): """> Convert colors to putty theme.""" - result = format_color.xrdb(COLORS) + result = format_colors.xrdb(COLORS) self.assertEqual(result[6], "*.color0: #363442\n*color0: #363442\n")