@@ -142,7 +142,7 @@ 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 = ('-F%s' % formats . FORMAT_SEPERATOR .join (tmux_formats ),) # output
146
146
147
147
proc = self .cmd ('list-sessions' , * tmux_args )
148
148
@@ -154,7 +154,10 @@ def _list_sessions(self):
154
154
sessions = proc .stdout
155
155
156
156
# 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
+ ]
158
161
159
162
# clear up empty dict
160
163
sessions = [
@@ -207,7 +210,7 @@ def _list_windows(self):
207
210
proc = self .cmd (
208
211
'list-windows' , # ``tmux list-windows``
209
212
'-a' ,
210
- '-F%s' % ' \t ' .join (tmux_formats ), # output
213
+ '-F%s' % formats . FORMAT_SEPERATOR .join (tmux_formats ), # output
211
214
)
212
215
213
216
if proc .stderr :
@@ -218,7 +221,10 @@ def _list_windows(self):
218
221
wformats = ['session_name' , 'session_id' ] + formats .WINDOW_FORMATS
219
222
220
223
# 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
+ ]
222
228
223
229
# clear up empty dict
224
230
windows = [dict ((k , v ) for k , v in window .items () if v ) for window in windows ]
@@ -267,7 +273,7 @@ def _list_panes(self):
267
273
'window_id' ,
268
274
'window_name' ,
269
275
] + 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 ]
271
277
272
278
proc = self .cmd ('list-panes' , '-a' , '-F%s' % '' .join (tmux_formats )) # output
273
279
@@ -285,7 +291,10 @@ def _list_panes(self):
285
291
] + formats .PANE_FORMATS
286
292
287
293
# 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
+ ]
289
298
290
299
# clear up empty dict
291
300
panes = [
@@ -526,7 +535,7 @@ def new_session(
526
535
tmux_args = (
527
536
'-s%s' % session_name ,
528
537
'-P' ,
529
- '-F%s' % ' \t ' .join (tmux_formats ), # output
538
+ '-F%s' % formats . FORMAT_SEPERATOR .join (tmux_formats ), # output
530
539
)
531
540
532
541
if not attach :
@@ -557,7 +566,7 @@ def new_session(
557
566
os .environ ['TMUX' ] = env
558
567
559
568
# 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 )))
561
570
562
571
# clear up empty dict
563
572
session = dict ((k , v ) for k , v in session .items () if v )
0 commit comments