From 0d1c95cf9c8e3b087be0b47272e6926d5469514d Mon Sep 17 00:00:00 2001
From: Alan Hamlett <alan.hamlett@gmail.com>
Date: Tue, 8 Sep 2015 14:15:35 -0700
Subject: [PATCH] remove redundant wakatime from test file names

---
 .../{test_wakatime_languages.py => test_languages.py}  |  0
 tests/{test_wakatime_main.py => test_main.py}          |  0
 ...t_wakatime_offlinequeue.py => test_offlinequeue.py} |  0
 tests/{test_wakatime_project.py => test_project.py}    |  0
 wakatime/logger.py                                     |  4 ++--
 wakatime/main.py                                       | 10 +++++-----
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename tests/{test_wakatime_languages.py => test_languages.py} (100%)
 rename tests/{test_wakatime_main.py => test_main.py} (100%)
 rename tests/{test_wakatime_offlinequeue.py => test_offlinequeue.py} (100%)
 rename tests/{test_wakatime_project.py => test_project.py} (100%)

diff --git a/tests/test_wakatime_languages.py b/tests/test_languages.py
similarity index 100%
rename from tests/test_wakatime_languages.py
rename to tests/test_languages.py
diff --git a/tests/test_wakatime_main.py b/tests/test_main.py
similarity index 100%
rename from tests/test_wakatime_main.py
rename to tests/test_main.py
diff --git a/tests/test_wakatime_offlinequeue.py b/tests/test_offlinequeue.py
similarity index 100%
rename from tests/test_wakatime_offlinequeue.py
rename to tests/test_offlinequeue.py
diff --git a/tests/test_wakatime_project.py b/tests/test_project.py
similarity index 100%
rename from tests/test_wakatime_project.py
rename to tests/test_project.py
diff --git a/wakatime/logger.py b/wakatime/logger.py
index d315e3b..7e275db 100644
--- a/wakatime/logger.py
+++ b/wakatime/logger.py
@@ -27,8 +27,8 @@ except (ImportError, SyntaxError):  # pragma: nocover
 class CustomEncoder(json.JSONEncoder):
 
     def default(self, obj):
-        if isinstance(obj, bytes):
-            obj = bytes.decode(obj)
+        if isinstance(obj, bytes):  # pragma: nocover
+            obj = u(obj)
             return json.dumps(obj)
         try:
             encoded = super(CustomEncoder, self).default(obj)
diff --git a/wakatime/main.py b/wakatime/main.py
index 551929d..2af2fcb 100644
--- a/wakatime/main.py
+++ b/wakatime/main.py
@@ -39,12 +39,12 @@ from .session_cache import SessionCache
 from .stats import get_file_stats
 try:
     from .packages import simplejson as json  # pragma: nocover
-except (ImportError, SyntaxError):
-    import json  # pragma: nocover
+except (ImportError, SyntaxError):  # pragma: nocover
+    import json
 try:
-    from .packages import tzlocal  # pragma: nocover
+    from .packages import tzlocal
 except:  # pragma: nocover
-    from .packages import tzlocal3 as tzlocal  # pragma: nocover
+    from .packages import tzlocal3 as tzlocal
 
 
 log = logging.getLogger('WakaTime')
@@ -56,7 +56,7 @@ class FileAction(argparse.Action):
         try:
             if os.path.isfile(values):
                 values = os.path.realpath(values)
-        except:
+        except:  # pragma: nocover
             pass
         setattr(namespace, self.dest, values)