Merge pull request #79 from dylanaraps/35

general: Add support for Python 3.5

4 files changed, 33 insertions, 24 deletions

diff --git a/tests/test_export.py b/tests/test_export.py
index 2323c69..7cb0bb4 100755
--- a/tests/test_export.py
+++ b/tests/test_export.py
@@ -2,7 +2,7 @@
 import unittest
 import unittest.mock
 import io
-import pathlib
+import os
 
 from pywal import export
 from pywal import util
@@ -11,7 +11,6 @@ from pywal import util
 # Import colors.
 COLORS = util.read_file_json("tests/test_files/test_file.json")
 COLORS["colors"].update(COLORS["special"])
-OUTPUT_DIR = pathlib.Path("/tmp/wal")
 
 util.create_dir("/tmp/wal")
 
@@ -21,34 +20,36 @@ class TestExportColors(unittest.TestCase):
 
     def test_all_templates(self):
         """> Test substitutions in template file."""
-        export.every(COLORS, OUTPUT_DIR)
+        export.every(COLORS, "/tmp/wal")
 
-        result = pathlib.Path("/tmp/wal/colors.sh").is_file()
+        result = os.path.isfile("/tmp/wal/colors.sh")
         self.assertTrue(result)
 
-        content = pathlib.Path("/tmp/wal/colors.sh").read_text()
-        content = content.split("\n")[6]
-        self.assertEqual(content, "foreground='#F5F1F4'")
+        with open("/tmp/wal/colors.sh") as file:
+            content = file.read().splitlines()
+
+        self.assertEqual(content[6], "foreground='#F5F1F4'")
 
     def test_css_template(self):
         """> Test substitutions in template file (css)."""
-        export.color(COLORS, "css", OUTPUT_DIR / "test.css")
+        export.color(COLORS, "css", "/tmp/wal/test.css")
 
-        result = pathlib.Path("/tmp/wal/test.css").is_file()
+        result = os.path.isfile("/tmp/wal/test.css")
         self.assertTrue(result)
 
-        content = pathlib.Path("/tmp/wal/test.css").read_text()
-        content = content.split("\n")[6]
-        self.assertEqual(content, "    --background: #1F211E;")
+        with open("/tmp/wal/test.css") as file:
+            content = file.read().splitlines()
+
+        self.assertEqual(content[6], "    --background: #1F211E;")
 
     def test_invalid_template(self):
         """> Test template validation."""
-        error_msg = "[!] warning: template 'dummy' doesn't exist."
+        error_msg = "warning: template 'dummy' doesn't exist."
 
         # Since this function prints a message on fail we redirect
         # it's output so that we can read it.
         with unittest.mock.patch('sys.stdout', new=io.StringIO()) as fake_out:
-            export.color(COLORS, "dummy", OUTPUT_DIR / "test.css")
+            export.color(COLORS, "dummy", "/tmp/wal/test.css")
             self.assertEqual(fake_out.getvalue().strip(), error_msg)
 
 
diff --git a/tests/test_main.py b/tests/test_main.py
index 196e3cf..1cc1e57 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -2,6 +2,8 @@
 import unittest
 import unittest.mock
 
+import os
+
 from pywal import __main__
 from pywal import reload
 from pywal import wallpaper
@@ -22,7 +24,8 @@ class TestMain(unittest.TestCase):
         """> Test arg parsing (-c)."""
         args = __main__.get_args(["-c"])
         __main__.process_args(args)
-        self.assertFalse((CACHE_DIR / "schemes").is_dir())
+        scheme_dir = os.path.join(CACHE_DIR, "schemes")
+        self.assertFalse(os.path.isdir(scheme_dir))
 
     def test_args_e(self):
         """> Test arg parsing (-e)."""
diff --git a/tests/test_sequences.py b/tests/test_sequences.py
index 66f4084..8034da7 100755
--- a/tests/test_sequences.py
+++ b/tests/test_sequences.py
@@ -32,7 +32,14 @@ class Testsequences(unittest.TestCase):
     def test_set_iterm_tab_color(self):
         """> Create iterm tab color sequences"""
         result = sequences.set_iterm_tab_color(COLORS["special"]["background"])
-        self.assertEqual(len(result), 3)
+        self.assertEqual(len(result), 104)
+
+    def test_sequence_order(self):
+        """> Test that the sequences are in order."""
+        result = sequences.create_sequences(COLORS, vte=False).split("\007")
+        self.assertEqual(result[2], "\x1b]4;2;#CC6A93")
+        self.assertEqual(result[15], "\x1b]4;15;#F5F1F4")
+        self.assertEqual(result[8], "\x1b]4;8;#666666")
 
 
 if __name__ == "__main__":
diff --git a/tests/test_util.py b/tests/test_util.py
index bc551ef..79b6b96 100755
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,7 +1,6 @@
 """Test util functions."""
 import unittest
 import os
-import pathlib
 
 from pywal import util
 
@@ -35,24 +34,23 @@ class TestUtil(unittest.TestCase):
 
     def test_save_file(self):
         """> Save colors to a file."""
-        tmp_file = pathlib.Path("/tmp/test_file")
+        tmp_file = "/tmp/test_file"
         util.save_file("Hello, world", tmp_file)
-        result = tmp_file.is_file()
+        result = os.path.isfile(tmp_file)
         self.assertTrue(result)
 
     def test_save_file_json(self):
         """> Save colors to a file."""
-        tmp_file = pathlib.Path("/tmp/test_file.json")
+        tmp_file = "/tmp/test_file.json"
         util.save_file_json(COLORS, tmp_file)
-        result = tmp_file.is_file()
+        result = os.path.isfile(tmp_file)
         self.assertTrue(result)
 
     def test_create_dir(self):
         """> Create a directory."""
-        tmp_dir = pathlib.Path("/tmp/test_dir")
+        tmp_dir = "/tmp/test_dir"
         util.create_dir(tmp_dir)
-        result = tmp_dir.is_dir()
-        self.assertTrue(result)
+        self.assertTrue(os.path.isdir(tmp_dir))
         os.rmdir(tmp_dir)
 
     def test_hex_to_rgb_black(self):