From 6865e29d1523923f5b299619abde27f2eeaf7291 Mon Sep 17 00:00:00 2001
From: "Fabien C. Y. Benureau" <fabien@benureau.com>
Date: Sat, 5 Jan 2019 00:45:25 +0900
Subject: [PATCH] fix for Python 2

---
 .gitignore            |  2 +-
 tests/test_usecase.py | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50eb853..616af63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 .python-version
 *~
 .DS_Store
-
+.eggs
 
 
 *.py[cod]
diff --git a/tests/test_usecase.py b/tests/test_usecase.py
index 0729990..38dc8ca 100644
--- a/tests/test_usecase.py
+++ b/tests/test_usecase.py
@@ -98,6 +98,14 @@ class CommandTestCase(fake_env.TestFakeFs):
         3. the expected output on stdout, verified with assertEqual.
         4. the expected output on stderr, verified with assertEqual.
         """
+        def normalize(s):
+            s = color.undye(s)
+            try:
+                s = s.decode('utf-8')
+            except AttributeError:
+                pass
+            return s
+
         try:
             outs = []
             for cmd in cmds:
@@ -122,8 +130,8 @@ class CommandTestCase(fake_env.TestFakeFs):
                         capture_wrap = fake_env.capture(pubs_cmd.execute,
                                                         verbose=PRINT_OUTPUT)
                         _, stdout, stderr = capture_wrap(actual_cmd.split())
-                        actual_out = color.undye(stdout)
-                        actual_err = color.undye(stderr)
+                        actual_out = normalize(stdout)
+                        actual_err = normalize(stderr)
                         if expected_out is not None:
                             self.assertEqual(p3.u_maybe(actual_out), p3.u_maybe(expected_out))
                         if expected_err is not None: