From 60a92a8526174a323fcfc6140152a8afa292a71a Mon Sep 17 00:00:00 2001
From: Jonathan Raiman <jonathanraiman@gmail.com>
Date: Thu, 24 Sep 2020 17:41:35 +0200
Subject: [PATCH] split on a special wildcard instead of tab to ensure
 compatibility with tmux 3.1

---
 libtmux/server.py  | 17 +++++++++--------
 libtmux/session.py |  4 ++--
 libtmux/window.py  |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/libtmux/server.py b/libtmux/server.py
index 8e27417be..99f11c346 100644
--- a/libtmux/server.py
+++ b/libtmux/server.py
@@ -142,7 +142,7 @@ def _list_sessions(self):
         sformats = formats.SESSION_FORMATS
         tmux_formats = ['#{%s}' % f for f in sformats]
 
-        tmux_args = ('-F%s' % '\t'.join(tmux_formats),)  # output
+        tmux_args = ('-F%s' % '$@$'.join(tmux_formats),)  # output
 
         proc = self.cmd('list-sessions', *tmux_args)
 
@@ -154,7 +154,7 @@ def _list_sessions(self):
         sessions = proc.stdout
 
         # combine format keys with values returned from ``tmux list-sessions``
-        sessions = [dict(zip(sformats, session.split('\t'))) for session in sessions]
+        sessions = [dict(zip(sformats, session.split('$@$'))) for session in sessions]
 
         # clear up empty dict
         sessions = [
@@ -203,11 +203,12 @@ def _list_windows(self):
 
         wformats = ['session_name', 'session_id'] + formats.WINDOW_FORMATS
         tmux_formats = ['#{%s}' % format for format in wformats]
+        print()
 
         proc = self.cmd(
             'list-windows',  # ``tmux list-windows``
             '-a',
-            '-F%s' % '\t'.join(tmux_formats),  # output
+            '-F%s' % '$@$'.join(tmux_formats),  # output
         )
 
         if proc.stderr:
@@ -218,7 +219,7 @@ def _list_windows(self):
         wformats = ['session_name', 'session_id'] + formats.WINDOW_FORMATS
 
         # combine format keys with values returned from ``tmux list-windows``
-        windows = [dict(zip(wformats, window.split('\t'))) for window in windows]
+        windows = [dict(zip(wformats, window.split('$@$'))) for window in windows]
 
         # clear up empty dict
         windows = [dict((k, v) for k, v in window.items() if v) for window in windows]
@@ -267,7 +268,7 @@ def _list_panes(self):
             'window_id',
             'window_name',
         ] + formats.PANE_FORMATS
-        tmux_formats = ['#{%s}\t' % f for f in pformats]
+        tmux_formats = ['#{%s}$@$' % f for f in pformats]
 
         proc = self.cmd('list-panes', '-a', '-F%s' % ''.join(tmux_formats))  # output
 
@@ -285,7 +286,7 @@ def _list_panes(self):
         ] + formats.PANE_FORMATS
 
         # combine format keys with values returned from ``tmux list-panes``
-        panes = [dict(zip(pformats, window.split('\t'))) for window in panes]
+        panes = [dict(zip(pformats, window.split('$@$'))) for window in panes]
 
         # clear up empty dict
         panes = [
@@ -526,7 +527,7 @@ def new_session(
         tmux_args = (
             '-s%s' % session_name,
             '-P',
-            '-F%s' % '\t'.join(tmux_formats),  # output
+            '-F%s' % '$@$'.join(tmux_formats),  # output
         )
 
         if not attach:
@@ -557,7 +558,7 @@ def new_session(
             os.environ['TMUX'] = env
 
         # combine format keys with values returned from ``tmux list-windows``
-        session = dict(zip(sformats, session.split('\t')))
+        session = dict(zip(sformats, session.split('$@$')))
 
         # clear up empty dict
         session = dict((k, v) for k, v in session.items() if v)
diff --git a/libtmux/session.py b/libtmux/session.py
index cd6af00a0..0c1db3f16 100644
--- a/libtmux/session.py
+++ b/libtmux/session.py
@@ -217,7 +217,7 @@ def new_window(
             start_directory = os.path.expanduser(start_directory)
             window_args += ('-c%s' % start_directory,)
 
-        window_args += ('-F"%s"' % '\t'.join(tmux_formats),)  # output
+        window_args += ('-F"%s"' % '$@$'.join(tmux_formats),)  # output
         if window_name:
             window_args += ('-n%s' % window_name,)
 
@@ -237,7 +237,7 @@ def new_window(
 
         window = proc.stdout[0]
 
-        window = dict(zip(wformats, window.split('\t')))
+        window = dict(zip(wformats, window.split('$@$')))
 
         # clear up empty dict
         window = dict((k, v) for k, v in window.items() if v)
diff --git a/libtmux/window.py b/libtmux/window.py
index e62e8dfe3..1c885bda3 100644
--- a/libtmux/window.py
+++ b/libtmux/window.py
@@ -434,7 +434,7 @@ def split_window(
             'window_index',
             'window_id',
         ] + formats.PANE_FORMATS
-        tmux_formats = ['#{%s}\t' % f for f in pformats]
+        tmux_formats = ['#{%s}$@$' % f for f in pformats]
 
         # '-t%s' % self.attached_pane.get('pane_id'),
         # 2013-10-18 LOOK AT THIS, rm'd it..
@@ -478,7 +478,7 @@ def split_window(
         else:
             pane = pane.stdout[0]
 
-            pane = dict(zip(pformats, pane.split('\t')))
+            pane = dict(zip(pformats, pane.split('$@$')))
 
             # clear up empty dict
             pane = dict((k, v) for k, v in pane.items() if v)