From ed306af00189f8c9f973fadf2e2b614cb4214bf7 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Mon, 26 Jun 2017 23:16:24 +1000
Subject: General: Remove most globals.

---
 pywal/__main__.py      |  4 ++--
 pywal/exp_colors.py    | 56 --------------------------------------------------
 pywal/export_colors.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 58 deletions(-)
 delete mode 100644 pywal/exp_colors.py
 create mode 100644 pywal/export_colors.py

diff --git a/pywal/__main__.py b/pywal/__main__.py
index 23561b2..ff09f13 100755
--- a/pywal/__main__.py
+++ b/pywal/__main__.py
@@ -8,7 +8,7 @@ import shutil
 import sys
 
 from pywal import globals as g
-from pywal import exp_colors
+from pywal import export_colors
 from pywal import gen_colors
 from pywal import set_colors
 from pywal import wallpaper
@@ -90,7 +90,7 @@ def process_args(args):
 
         # Set the colors.
         set_colors.send_sequences(colors_plain, args.t)
-        exp_colors.export_colors(colors_plain)
+        export_colors.export_colors(colors_plain)
 
     # -o
     if args.o:
diff --git a/pywal/exp_colors.py b/pywal/exp_colors.py
deleted file mode 100644
index faf5e93..0000000
--- a/pywal/exp_colors.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""
-Export colors in various formats.
-"""
-import shutil
-import subprocess
-
-from pywal import globals as g
-from pywal import util
-from pywal import format_color
-
-
-def save_colors(colors, export_file, message):
-    """Export colors to var format."""
-    colors = "".join(colors)
-    util.save_file(colors, g.CACHE_DIR / export_file)
-    print(f"export: exported {message}.")
-
-
-def reload_xrdb(export_file):
-    """Merge the colors into the X db so new terminals use them."""
-    if shutil.which("xrdb"):
-        subprocess.call(["xrdb", "-merge", g.CACHE_DIR / export_file])
-
-
-def reload_i3():
-    """Reload i3 colors."""
-    if shutil.which("i3-msg"):
-        util.disown("i3-msg", "reload")
-
-
-def export_colors(colors):
-    """Export colors in various formats."""
-    plain_colors = format_color.plain(colors)
-    save_colors(plain_colors, "colors", "plain hex colors")
-
-    # Shell based colors.
-    shell_colors = format_color.shell(colors)
-    save_colors(shell_colors, "colors.sh", "shell variables")
-
-    # Web based colors.
-    css_colors = format_color.css(colors)
-    save_colors(css_colors, "colors.css", "css variables")
-    scss_colors = format_color.scss(colors)
-    save_colors(scss_colors, "colors.scss", "scss variables")
-
-    # Text editor based colors.
-    putty_colors = format_color.putty(colors)
-    save_colors(putty_colors, "colors-putty.reg", "putty theme")
-
-    # X based colors.
-    xrdb_colors = format_color.xrdb(colors)
-    save_colors(xrdb_colors, "xcolors", "xrdb colors")
-
-    # i3 colors.
-    reload_xrdb("xcolors")
-    reload_i3()
diff --git a/pywal/export_colors.py b/pywal/export_colors.py
new file mode 100644
index 0000000..faf5e93
--- /dev/null
+++ b/pywal/export_colors.py
@@ -0,0 +1,56 @@
+"""
+Export colors in various formats.
+"""
+import shutil
+import subprocess
+
+from pywal import globals as g
+from pywal import util
+from pywal import format_color
+
+
+def save_colors(colors, export_file, message):
+    """Export colors to var format."""
+    colors = "".join(colors)
+    util.save_file(colors, g.CACHE_DIR / export_file)
+    print(f"export: exported {message}.")
+
+
+def reload_xrdb(export_file):
+    """Merge the colors into the X db so new terminals use them."""
+    if shutil.which("xrdb"):
+        subprocess.call(["xrdb", "-merge", g.CACHE_DIR / export_file])
+
+
+def reload_i3():
+    """Reload i3 colors."""
+    if shutil.which("i3-msg"):
+        util.disown("i3-msg", "reload")
+
+
+def export_colors(colors):
+    """Export colors in various formats."""
+    plain_colors = format_color.plain(colors)
+    save_colors(plain_colors, "colors", "plain hex colors")
+
+    # Shell based colors.
+    shell_colors = format_color.shell(colors)
+    save_colors(shell_colors, "colors.sh", "shell variables")
+
+    # Web based colors.
+    css_colors = format_color.css(colors)
+    save_colors(css_colors, "colors.css", "css variables")
+    scss_colors = format_color.scss(colors)
+    save_colors(scss_colors, "colors.scss", "scss variables")
+
+    # Text editor based colors.
+    putty_colors = format_color.putty(colors)
+    save_colors(putty_colors, "colors-putty.reg", "putty theme")
+
+    # X based colors.
+    xrdb_colors = format_color.xrdb(colors)
+    save_colors(xrdb_colors, "xcolors", "xrdb colors")
+
+    # i3 colors.
+    reload_xrdb("xcolors")
+    reload_i3()
-- 
cgit v1.2.3