Move __list_{sessions,windows,panes} into _list_{sessions,windows,panes}

Author: tony

tmuxp/server.py

@@ -96,15 +96,18 @@ def tmux(self, *args, **kwargs):
 
         return tmux(*args, **kwargs)
 
-    def __list_sessions(self):
-        """Return list of ``$ tmux(1) list-sessions`` stdout.
+    def _list_sessions(self):
+        """Return a list of session information ``tmux(1)`` for the sessions.
+
+        Via ``$ tmux(1) list-sessions`` stdout.
 
         The :py:obj:`list` is derived from ``stdout`` in :class:`util.tmux`
         which wraps :py:meth:`Subprocess.Popen`.
 
-        :rtype: list
+        :rtype: :py:obj:`list` of :py:obj:`dict`
 
         """
+
         sformats = formats.SESSION_FORMATS
         tmux_formats = ['#{%s}' % f for f in sformats]
 
@@ -123,20 +126,11 @@ def __list_sessions(self):
             session_info = proc.stdout[0]
 
         if proc.stderr:
-            raise Exception(sessions.stderr)
-
-        return proc.stdout
-
-    def _list_sessions(self):
-        '''
-        Return a list of session information ``tmux(1)`` for the sessions
-
-        :rtype: :py:obj:`list` of :py:obj:`dict`
-        '''
+            raise Exception(proc.stderr)
 
         sformats = formats.SESSION_FORMATS
         tmux_formats = ['#{%s}' % format for format in sformats]
-        sessions = self.__list_sessions()
+        sessions = proc.stdout
 
         # combine format keys with values returned from ``tmux list-windows``
         sessions = [dict(zip(
@@ -176,8 +170,10 @@ def sessions(self):
     #: Alias of :attr:`sessions`.
     children = sessions
 
-    def __list_windows(self):
-        """Return list of ``$ tmux(1) list-windows`` stdout.
+    def _list_windows(self):
+        """Return list of dicts filtered from :meth:`__list_windows`.
+
+        List of ``$ tmux(1) list-windows`` stdout.
 
         The :py:obj:`list` is derived from ``stdout`` in :class:`util.tmux`
         which wraps :py:meth:`Subprocess.Popen`.
@@ -189,24 +185,19 @@ def __list_windows(self):
         wformats = ['session_name', 'session_id'] + formats.WINDOW_FORMATS
         tmux_formats = ['#{%s}' % format for format in wformats]
 
-        windows = self.tmux(
+        proc = self.tmux(
             'list-windows',                     # ``tmux list-windows``
             '-a',
             '-F%s' % '\t'.join(tmux_formats),   # output
         )
 
-        if windows.stderr:
-            raise Exception(windows.stderr)
-
-        return windows.stdout
+        if proc.stderr:
+            raise Exception(proc.stderr)
 
-    def _list_windows(self):
-        """Return list of dicts filtered from :meth:`__list_windows`."""
+        windows = proc.stdout
 
         wformats = ['session_name', 'session_id'] + formats.WINDOW_FORMATS
 
-        windows = self.__list_windows()
-
         # combine format keys with values returned from ``tmux list-windows``
         windows = [dict(zip(
             wformats, window.split('\t'))) for window in windows]
@@ -238,39 +229,36 @@ def _update_windows(self):
         self._list_windows()
         return self
 
-    def __list_panes(self):
-        """Return list of ``$ tmux(1) list-panes`` stdout.
+    def _list_panes(self):
+        """Return list of dicts filtered from :meth:`__list_panes`.
+
+        list of ``$ tmux(1) list-panes`` stdout.
 
         The :py:obj:`list` is derived from ``stdout`` in :class:`util.tmux`
         which wraps :py:meth:`Subprocess.Popen`.
 
-
         :rtype: list
 
         """
+
         pformats = ['session_name', 'session_id',
                     'window_index', 'window_id', 'window_name'] + formats.PANE_FORMATS
         tmux_formats = ['#{%s}\t' % f for f in pformats]
 
-        panes = self.tmux(
+        proc = self.tmux(
             'list-panes',
             '-a',
             '-F%s' % ''.join(tmux_formats),     # output
         )
 
-        if panes.stderr:
-            raise Exception(panes.stderr)
-
-        return panes.stdout
+        if proc.stderr:
+            raise Exception(proc.stderr)
 
-    def _list_panes(self):
-        """Return list of dicts filtered from :meth:`__list_panes`."""
+        panes = proc.stdout
 
         pformats = ['session_name', 'session_id',
                     'window_index', 'window_id', 'window_name'] + formats.PANE_FORMATS
 
-        panes = self.__list_panes()
-
         # combine format keys with values returned from ``tmux list-panes``
         panes = [dict(zip(
             pformats, window.split('\t'))) for window in panes]