@@ -142,7 +142,9 @@ def _list_sessions(self):
142
142
sformats = formats .SESSION_FORMATS
143
143
tmux_formats = ['#{%s}' % f for f in sformats ]
144
144
145
- tmux_args = ('-F%s' % '\t ' .join (tmux_formats ),) # output
145
+ tmux_args = (
146
+ '-F%s' % formats .FORMAT_SEPERATOR .join (tmux_formats ),
147
+ ) # output
146
148
147
149
proc = self .cmd ('list-sessions' , * tmux_args )
148
150
@@ -154,7 +156,17 @@ def _list_sessions(self):
154
156
sessions = proc .stdout
155
157
156
158
# combine format keys with values returned from ``tmux list-sessions``
157
- sessions = [dict (zip (sformats , session .split ('\t ' ))) for session in sessions ]
159
+ sessions = [
160
+ dict (
161
+ zip (
162
+ sformats ,
163
+ session .split (
164
+ formats .FORMAT_SEPERATOR
165
+ )
166
+ )
167
+ )
168
+ for session in sessions
169
+ ]
158
170
159
171
# clear up empty dict
160
172
sessions = [
@@ -207,7 +219,9 @@ def _list_windows(self):
207
219
proc = self .cmd (
208
220
'list-windows' , # ``tmux list-windows``
209
221
'-a' ,
210
- '-F%s' % '\t ' .join (tmux_formats ), # output
222
+ '-F%s' % formats .FORMAT_SEPERATOR .join (
223
+ tmux_formats
224
+ ), # output
211
225
)
212
226
213
227
if proc .stderr :
@@ -218,7 +232,17 @@ def _list_windows(self):
218
232
wformats = ['session_name' , 'session_id' ] + formats .WINDOW_FORMATS
219
233
220
234
# combine format keys with values returned from ``tmux list-windows``
221
- windows = [dict (zip (wformats , window .split ('\t ' ))) for window in windows ]
235
+ windows = [
236
+ dict (
237
+ zip (
238
+ wformats ,
239
+ window .split (
240
+ formats .FORMAT_SEPERATOR
241
+ )
242
+ )
243
+ )
244
+ for window in windows
245
+ ]
222
246
223
247
# clear up empty dict
224
248
windows = [dict ((k , v ) for k , v in window .items () if v ) for window in windows ]
@@ -267,7 +291,10 @@ def _list_panes(self):
267
291
'window_id' ,
268
292
'window_name' ,
269
293
] + formats .PANE_FORMATS
270
- tmux_formats = ['#{%s}\t ' % f for f in pformats ]
294
+ tmux_formats = [
295
+ ('#{%%s}%s' % formats .FORMAT_SEPERATOR ) % f
296
+ for f in pformats
297
+ ]
271
298
272
299
proc = self .cmd ('list-panes' , '-a' , '-F%s' % '' .join (tmux_formats )) # output
273
300
@@ -285,7 +312,17 @@ def _list_panes(self):
285
312
] + formats .PANE_FORMATS
286
313
287
314
# combine format keys with values returned from ``tmux list-panes``
288
- panes = [dict (zip (pformats , window .split ('\t ' ))) for window in panes ]
315
+ panes = [
316
+ dict (
317
+ zip (
318
+ pformats ,
319
+ window .split (
320
+ formats .FORMAT_SEPERATOR
321
+ )
322
+ )
323
+ )
324
+ for window in panes
325
+ ]
289
326
290
327
# clear up empty dict
291
328
panes = [
@@ -526,7 +563,7 @@ def new_session(
526
563
tmux_args = (
527
564
'-s%s' % session_name ,
528
565
'-P' ,
529
- '-F%s' % ' \t ' .join (tmux_formats ), # output
566
+ '-F%s' % formats . FORMAT_SEPERATOR .join (tmux_formats ), # output
530
567
)
531
568
532
569
if not attach :
@@ -557,7 +594,7 @@ def new_session(
557
594
os .environ ['TMUX' ] = env
558
595
559
596
# combine format keys with values returned from ``tmux list-windows``
560
- session = dict (zip (sformats , session .split (' \t ' )))
597
+ session = dict (zip (sformats , session .split (formats . FORMAT_SEPERATOR )))
561
598
562
599
# clear up empty dict
563
600
session = dict ((k , v ) for k , v in session .items () if v )
0 commit comments