Change libtmux to use new-style attributes

Author: tony

libtmux/server.py

@@ -299,9 +299,8 @@ def attached_sessions(self):
         for session in sessions:
             if 'session_attached' in session:
                 # for now session_active is a unicode
-                if session.get('session_attached') == '1':
-                    logger.debug('session %s attached', session.get(
-                        'session_name'))
+                if session.attached == '1':
+                    logger.debug('session %s attached', session.name)
                     attached_sessions.append(session)
                 else:
                     continue

libtmux/session.py

@@ -73,7 +73,7 @@ def cmd(self, *args, **kwargs):
 
         """
         if '-t' not in kwargs:
-            kwargs['-t'] = self.get('session_id')
+            kwargs['-t'] = self.id
         return self.server.cmd(*args, **kwargs)
 
     def attach_session(self, target_session=None):
@@ -82,15 +82,15 @@ def attach_session(self, target_session=None):
         :param: target_session: str. name of the session. fnmatch(3) works.
 
         """
-        proc = self.cmd('attach-session', '-t%s' % self.get('session_id'))
+        proc = self.cmd('attach-session', '-t%s' % self.id)
 
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
 
     def kill_session(self):
         """``$ tmux kill-session``."""
 
-        proc = self.cmd('kill-session', '-t%s' % self.get('session_id'))
+        proc = self.cmd('kill-session', '-t%s' % self.id)
 
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
@@ -100,7 +100,7 @@ def switch_client(self, target_session=None):
 
         :param: target_session: str. note this accepts fnmatch(3).
         """
-        proc = self.cmd('switch-client', '-t%s' % self.get('session_id'))
+        proc = self.cmd('switch-client', '-t%s' % self.id)
 
         if proc.stderr:
             raise exc.LibTmuxException(proc.stderr)
@@ -115,7 +115,7 @@ def rename_session(self, new_name):
         """
         proc = self.cmd(
             'rename-session',
-            '-t%s' % self.get('session_id'),
+            '-t%s' % self.id,
             new_name
         )
 
@@ -189,7 +189,7 @@ def new_window(self,
 
         window_args += (
             # empty string for window_index will use the first one available
-            '-t%s:%s' % (self.get('session_id'), window_index),
+            '-t%s:%s' % (self.id, window_index),
         )
 
         if window_shell:
@@ -225,7 +225,7 @@ def kill_window(self, target_window=None):
 
         if target_window:
             if isinstance(target_window, int):
-                target = '-t%s:%d' % (self.get('session_name'), target_window)
+                target = '-t%s:%d' % (self.name, target_window)
             else:
                 target = '-t%s' % target_window
 
@@ -240,7 +240,7 @@ def _list_windows(self):
         windows = self.server._update_windows()._windows
 
         windows = [
-            w for w in windows if w['session_id'] == self.get('session_id')
+            w for w in windows if w['session_id'] == self.id
         ]
 
         return windows
@@ -416,6 +416,6 @@ def show_option(self, option, g=False):
     def __repr__(self):
         return "%s(%s %s)" % (
             self.__class__.__name__,
-            self.get('session_id'),
-            self.get('session_name')
+            self.id,
+            self.name
         )

libtmux/window.py

@@ -40,9 +40,9 @@ def __init__(self, session=None, **kwargs):
     def __repr__(self):
         return "%s(%s %s:%s, %s)" % (
             self.__class__.__name__,
-            self.get('window_id'),
-            self.get('window_index'),
-            self.get('window_name'),
+            self.id,
+            self.index,
+            self.name,
             self.session
         )
 
@@ -86,7 +86,7 @@ def cmd(self, cmd, *args, **kwargs):
 
         """
         if not any(arg.startswith('-t') for arg in args):
-            args = ('-t', self.get('window_id')) + args
+            args = ('-t', self.id) + args
 
         return self.server.cmd(cmd, *args, **kwargs)
 
@@ -117,7 +117,7 @@ def select_layout(self, layout=None):
 
         proc = self.cmd(
             'select-layout',
-            '-t%s:%s' % (self.get('session_id'), self.get('window_index')),
+            '-t%s:%s' % (self.get('session_id'), self.index),
             layout
         )
 
@@ -142,8 +142,8 @@ def set_window_option(self, option, value):
 
         process = self.cmd(
             'set-window-option',
-            '-t%s:%s' % (self.get('session_id'), self.get('window_index')),
-            # '-t%s' % self.get('window_id'),
+            '-t%s:%s' % (self.get('session_id'), self.index),
+            # '-t%s' % self.id,
             option, value
         )
 
@@ -153,7 +153,7 @@ def set_window_option(self, option, value):
             raise ValueError(
                 'tmux set-window-option -t%s:%s %s %s\n' % (
                     self.get('session_id'),
-                    self.get('window_index'),
+                    self.index,
                     option,
                     value
                 ) +
@@ -263,8 +263,8 @@ def kill_window(self):
 
         proc = self.cmd(
             'kill-window',
-            # '-t:%s' % self.get('window_id')
-            '-t%s:%s' % (self.get('session_id'), self.get('window_index')),
+            # '-t:%s' % self.id
+            '-t%s:%s' % (self.get('session_id'), self.index),
         )
 
         if proc.stderr:
@@ -283,7 +283,7 @@ def move_window(self, destination):
 
         proc = self.cmd(
             'move-window',
-            '-s%s:%s' % (self.get('session_id'), self.get('window_index')),
+            '-s%s:%s' % (self.get('session_id'), self.index),
             '-t%s:%s' % (self.get('session_id'), destination),
         )
 
@@ -302,7 +302,7 @@ def select_window(self):
         :rtype: :class:`Window`
 
         """
-        target = '%s:%s' % (self.get('session_id'), self.get('window_index')),
+        target = '%s:%s' % (self.get('session_id'), self.index),
         return self.session.select_window(target)
 
     def select_pane(self, target_pane):
@@ -318,7 +318,7 @@ def select_pane(self, target_pane):
         if target_pane in ['-l', '-U', '-D', '-L', '-R']:
             proc = self.cmd(
                 'select-pane',
-                '-t%s' % self.get('window_id'),
+                '-t%s' % self.id,
                 target_pane
             )
         else:
@@ -426,7 +426,6 @@ def attached_pane(self):
             if 'pane_active' in pane:
                 # for now pane_active is a unicode
                 if pane.get('pane_active') == '1':
-                    # return Pane(window=self, **pane)
                     return Pane(window=self, **pane)
                 else:
                     continue
@@ -440,7 +439,7 @@ def _list_panes(self):
             p for p in panes if p['session_id'] == self.get('session_id')
         ]
         panes = [
-            p for p in panes if p['window_id'] == self.get('window_id')
+            p for p in panes if p['window_id'] == self.id
         ]
         return panes