Skip to content

Commit 0515fde

Browse files
asyncmind0tony
authored andcommitted
fix: use | instead of \t for format sepatator
- for some reason on my arch install tmux does not print back tabs I'm not sure if it affects other but just puttin this out there
1 parent 22cf044 commit 0515fde

File tree

4 files changed

+27
-12
lines changed

4 files changed

+27
-12
lines changed

libtmux/formats.py

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
88
"""
99

10+
from __future__ import absolute_import, unicode_literals, with_statement
11+
12+
FORMAT_SEPERATOR = "|"
13+
1014
SESSION_FORMATS = [
1115
'session_name',
1216
'session_windows',

libtmux/server.py

+17-8
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def _list_sessions(self):
142142
sformats = formats.SESSION_FORMATS
143143
tmux_formats = ['#{%s}' % f for f in sformats]
144144

145-
tmux_args = ('-F%s' % '\t'.join(tmux_formats),) # output
145+
tmux_args = ('-F%s' % formats.FORMAT_SEPERATOR.join(tmux_formats),) # output
146146

147147
proc = self.cmd('list-sessions', *tmux_args)
148148

@@ -154,7 +154,10 @@ def _list_sessions(self):
154154
sessions = proc.stdout
155155

156156
# combine format keys with values returned from ``tmux list-sessions``
157-
sessions = [dict(zip(sformats, session.split('\t'))) for session in sessions]
157+
sessions = [
158+
dict(zip(sformats, session.split(formats.FORMAT_SEPERATOR)))
159+
for session in sessions
160+
]
158161

159162
# clear up empty dict
160163
sessions = [
@@ -207,7 +210,7 @@ def _list_windows(self):
207210
proc = self.cmd(
208211
'list-windows', # ``tmux list-windows``
209212
'-a',
210-
'-F%s' % '\t'.join(tmux_formats), # output
213+
'-F%s' % formats.FORMAT_SEPERATOR.join(tmux_formats), # output
211214
)
212215

213216
if proc.stderr:
@@ -218,7 +221,10 @@ def _list_windows(self):
218221
wformats = ['session_name', 'session_id'] + formats.WINDOW_FORMATS
219222

220223
# combine format keys with values returned from ``tmux list-windows``
221-
windows = [dict(zip(wformats, window.split('\t'))) for window in windows]
224+
windows = [
225+
dict(zip(wformats, window.split(formats.FORMAT_SEPERATOR)))
226+
for window in windows
227+
]
222228

223229
# clear up empty dict
224230
windows = [dict((k, v) for k, v in window.items() if v) for window in windows]
@@ -267,7 +273,7 @@ def _list_panes(self):
267273
'window_id',
268274
'window_name',
269275
] + formats.PANE_FORMATS
270-
tmux_formats = ['#{%s}\t' % f for f in pformats]
276+
tmux_formats = [('#{%%s}%s' % formats.FORMAT_SEPERATOR) % f for f in pformats]
271277

272278
proc = self.cmd('list-panes', '-a', '-F%s' % ''.join(tmux_formats)) # output
273279

@@ -285,7 +291,10 @@ def _list_panes(self):
285291
] + formats.PANE_FORMATS
286292

287293
# combine format keys with values returned from ``tmux list-panes``
288-
panes = [dict(zip(pformats, window.split('\t'))) for window in panes]
294+
panes = [
295+
dict(zip(pformats, window.split(formats.FORMAT_SEPERATOR)))
296+
for window in panes
297+
]
289298

290299
# clear up empty dict
291300
panes = [
@@ -526,7 +535,7 @@ def new_session(
526535
tmux_args = (
527536
'-s%s' % session_name,
528537
'-P',
529-
'-F%s' % '\t'.join(tmux_formats), # output
538+
'-F%s' % formats.FORMAT_SEPERATOR.join(tmux_formats), # output
530539
)
531540

532541
if not attach:
@@ -557,7 +566,7 @@ def new_session(
557566
os.environ['TMUX'] = env
558567

559568
# combine format keys with values returned from ``tmux list-windows``
560-
session = dict(zip(sformats, session.split('\t')))
569+
session = dict(zip(sformats, session.split(formats.FORMAT_SEPERATOR)))
561570

562571
# clear up empty dict
563572
session = dict((k, v) for k, v in session.items() if v)

libtmux/session.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,9 @@ def new_window(
217217
start_directory = os.path.expanduser(start_directory)
218218
window_args += ('-c%s' % start_directory,)
219219

220-
window_args += ('-F"%s"' % '\t'.join(tmux_formats),) # output
220+
window_args += (
221+
'-F"%s"' % formats.FORMAT_SEPERATOR.join(tmux_formats),
222+
) # output
221223
if window_name:
222224
window_args += ('-n%s' % window_name,)
223225

@@ -237,7 +239,7 @@ def new_window(
237239

238240
window = proc.stdout[0]
239241

240-
window = dict(zip(wformats, window.split('\t')))
242+
window = dict(zip(wformats, window.split(formats.FORMAT_SEPERATOR)))
241243

242244
# clear up empty dict
243245
window = dict((k, v) for k, v in window.items() if v)

libtmux/window.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ def split_window(
434434
'window_index',
435435
'window_id',
436436
] + formats.PANE_FORMATS
437-
tmux_formats = ['#{%s}\t' % f for f in pformats]
437+
tmux_formats = [('#{%%s}%s' % formats.FORMAT_SEPERATOR) % f for f in pformats]
438438

439439
# '-t%s' % self.attached_pane.get('pane_id'),
440440
# 2013-10-18 LOOK AT THIS, rm'd it..
@@ -478,7 +478,7 @@ def split_window(
478478
else:
479479
pane = pane.stdout[0]
480480

481-
pane = dict(zip(pformats, pane.split('\t')))
481+
pane = dict(zip(pformats, pane.split(formats.FORMAT_SEPERATOR)))
482482

483483
# clear up empty dict
484484
pane = dict((k, v) for k, v in pane.items() if v)

0 commit comments

Comments
 (0)