@@ -145,7 +145,9 @@ def _list_sessions(self):
145
145
sformats = formats .SESSION_FORMATS
146
146
tmux_formats = ['#{%s}' % f for f in sformats ]
147
147
148
- tmux_args = ('-F%s' % '\t ' .join (tmux_formats ),) # output
148
+ tmux_args = (
149
+ '-F%s' % formats .FORMAT_SEPERATOR .join (tmux_formats ),
150
+ ) # output
149
151
150
152
proc = self .cmd ('list-sessions' , * tmux_args )
151
153
@@ -157,7 +159,17 @@ def _list_sessions(self):
157
159
sessions = proc .stdout
158
160
159
161
# combine format keys with values returned from ``tmux list-sessions``
160
- sessions = [dict (zip (sformats , session .split ('\t ' ))) for session in sessions ]
162
+ sessions = [
163
+ dict (
164
+ zip (
165
+ sformats ,
166
+ session .split (
167
+ formats .FORMAT_SEPERATOR
168
+ )
169
+ )
170
+ )
171
+ for session in sessions
172
+ ]
161
173
162
174
# clear up empty dict
163
175
sessions = [
@@ -210,7 +222,9 @@ def _list_windows(self):
210
222
proc = self .cmd (
211
223
'list-windows' , # ``tmux list-windows``
212
224
'-a' ,
213
- '-F%s' % '\t ' .join (tmux_formats ), # output
225
+ '-F%s' % formats .FORMAT_SEPERATOR .join (
226
+ tmux_formats
227
+ ), # output
214
228
)
215
229
216
230
if proc .stderr :
@@ -221,7 +235,17 @@ def _list_windows(self):
221
235
wformats = ['session_name' , 'session_id' ] + formats .WINDOW_FORMATS
222
236
223
237
# combine format keys with values returned from ``tmux list-windows``
224
- windows = [dict (zip (wformats , window .split ('\t ' ))) for window in windows ]
238
+ windows = [
239
+ dict (
240
+ zip (
241
+ wformats ,
242
+ window .split (
243
+ formats .FORMAT_SEPERATOR
244
+ )
245
+ )
246
+ )
247
+ for window in windows
248
+ ]
225
249
226
250
# clear up empty dict
227
251
windows = [dict ((k , v ) for k , v in window .items () if v ) for window in windows ]
@@ -270,7 +294,10 @@ def _list_panes(self):
270
294
'window_id' ,
271
295
'window_name' ,
272
296
] + formats .PANE_FORMATS
273
- tmux_formats = ['#{%s}\t ' % f for f in pformats ]
297
+ tmux_formats = [
298
+ ('#{%%s}%s' % formats .FORMAT_SEPERATOR ) % f
299
+ for f in pformats
300
+ ]
274
301
275
302
proc = self .cmd ('list-panes' , '-a' , '-F%s' % '' .join (tmux_formats )) # output
276
303
@@ -288,7 +315,17 @@ def _list_panes(self):
288
315
] + formats .PANE_FORMATS
289
316
290
317
# combine format keys with values returned from ``tmux list-panes``
291
- panes = [dict (zip (pformats , window .split ('\t ' ))) for window in panes ]
318
+ panes = [
319
+ dict (
320
+ zip (
321
+ pformats ,
322
+ window .split (
323
+ formats .FORMAT_SEPERATOR
324
+ )
325
+ )
326
+ )
327
+ for window in panes
328
+ ]
292
329
293
330
# clear up empty dict
294
331
panes = [
@@ -531,7 +568,7 @@ def new_session(
531
568
tmux_args = (
532
569
'-s%s' % session_name ,
533
570
'-P' ,
534
- '-F%s' % ' \t ' .join (tmux_formats ), # output
571
+ '-F%s' % formats . FORMAT_SEPERATOR .join (tmux_formats ), # output
535
572
)
536
573
537
574
if not attach :
@@ -562,7 +599,7 @@ def new_session(
562
599
os .environ ['TMUX' ] = env
563
600
564
601
# combine format keys with values returned from ``tmux list-windows``
565
- session = dict (zip (sformats , session .split (' \t ' )))
602
+ session = dict (zip (sformats , session .split (formats . FORMAT_SEPERATOR )))
566
603
567
604
# clear up empty dict
568
605
session = dict ((k , v ) for k , v in session .items () if v )
0 commit comments