midway commit, need test decorators for tmux versions

Author: tony

libtmux/exc.py

@@ -34,8 +34,22 @@ class BadSessionName(LibTmuxException):
     pass
 
 
-class UnknownOption(LibTmuxException):
+class OptionError(LibTmuxException):
+
+    """Root error for any error involving invalid, ambiguous or bad options."""
+
+    pass
+
+
+class UnknownOption(OptionError):
 
     """Option unknown to tmux show-option(s) or show-window-option(s)."""
 
     pass
+
+
+class InvalidOption(OptionError):
+
+    """Option invalid to tmux, introduced in tmux v2.4."""
+
+    pass

libtmux/session.py

@@ -358,6 +358,9 @@ def set_option(self, option, value, g=False):
             error = proc.stderr[0]
             if 'unknown option' in error:
                 raise exc.UnknownOption(error)
+            elif 'invalid option' in error:
+                raise exc.InvalidOption(error)
+
             raise ValueError('tmux set-option stderr: %s' % error)
 
     def show_options(self, option=None, g=False):

libtmux/window.py

@@ -150,17 +150,20 @@ def set_window_option(self, option, value):
 
         if isinstance(cmd.stderr, list) and len(cmd.stderr):
             error = cmd.stderr[0]
-            if 'unknown option' in error:
+            if any(
+                x in error
+                for x in ['unknown option', 'invalid option']
+            ):
                 raise exc.UnknownOption(error)
 
             raise ValueError(
-                'tmux set-window-option -t%s:%s %s %s\n' % (
+                'tmux set-window-option -t%s:%s %s %s\n%s' % (
                     self.get('session_id'),
                     self.index,
                     option,
-                    value
-                ) +
-                cmd.stderr
+                    value,
+                    error
+                )
             )
 
     def show_window_options(self, option=None, g=False):
@@ -224,8 +227,11 @@ def show_window_option(self, option, g=False):
             'show-window-options', *tmux_args
         )
 
-        if len(cmd.stderr) and 'unknown option' in cmd.stderr[0]:
-            raise exc.UnknownOption(cmd.stderr[0])
+        if len(cmd.stderr):
+            if 'unknown option' in cmd.stderr:
+                raise exc.UnknownOption(cmd.stderr[0])
+            elif 'invalid option' in cmd.stderr:
+                raise exc.InvalidOption(cmd.stderr[0])
 
         if not len(cmd.stdout):
             return None

tests/test_window.py

@@ -180,7 +180,7 @@ def test_set_show_window_options(session):
 
 def test_empty_window_option_returns_None(session):
     window = session.new_window(window_name='test_window')
-    assert window.show_window_option('default-shell') is None
+    assert window.show_window_option('alternate-screen') is None
 
 
 def test_show_window_option(session):