update tzlocal package. move packages to python version folder.

wakatime/main.py

@@ -50,10 +50,7 @@ try:
     from .packages import simplejson as json  # pragma: nocover
 except (ImportError, SyntaxError):  # pragma: nocover
     import json
-try:
 from .packages import tzlocal
-except:  # pragma: nocover
-    from .packages import tzlocal3 as tzlocal
 
 
 log = logging.getLogger('WakaTime')

wakatime/packages/__init__.py

@@ -0,0 +1,14 @@
+import os
+import sys
+
+from ..compat import is_py2
+
+if is_py2:
+    sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'py2'))
+else:
+    sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'py3'))
+
+import tzlocal
+from pygments.lexers import get_lexer_by_name, guess_lexer_for_filename
+from pygments.modeline import get_filetype_from_buffer
+from pygments.util import ClassNotFound