Make more extensive testing and more generic fix

Author: myw

libtmux/_compat.py

@@ -90,3 +90,9 @@ def reraise(tp, value, tb=None):
 
 
 number_types = integer_types + (float,)
+
+def str_from_console(s):
+    try:
+        return text_type(s)
+    except UnicodeDecodeError:
+        return text_type(s, encoding='utf_8')

libtmux/common.py

@@ -14,7 +14,7 @@
 from distutils.version import LooseVersion
 
 from . import exc
-from ._compat import console_to_str, text_type
+from ._compat import console_to_str, str_from_console
 
 logger = logging.getLogger(__name__)
 
@@ -195,7 +195,7 @@ def __init__(self, *args, **kwargs):
 
         cmd = [tmux_bin]
         cmd += args  # add the command arguments to cmd
-        cmd = [text_type(c, encoding='utf_8') for c in cmd]
+        cmd = [str_from_console(c) for c in cmd]
 
         self.cmd = cmd
 

tests/test_common.py

@@ -161,7 +161,7 @@ def test_tmux_cmd_raises_on_not_found():
 
 
 def test_tmux_cmd_unicode():
-    tmux_cmd('has-session', 'юникод')
+    tmux_cmd('new-window', '-t', 3, '-n', 'юникод', '-F', u'Ελληνικά')
 
 
 @pytest.mark.parametrize("session_name,raises,exc_msg_regex", [