Skip to content

Commit 6a3a024

Browse files
committed
Part #2 of shlex.split fix
The pane-border-format option was introduced in tmux 2.3, so do not run a test for that on older versions.
1 parent da6ec0a commit 6a3a024

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

libtmux/window.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ def show_window_option(self, option, g=False):
229229
if not len(cmd.stdout):
230230
return None
231231

232-
option = [item.split(' ') for item in cmd.stdout][0]
232+
option = [shlex.split(item) for item in cmd.stdout][0]
233233

234234
if option[1].isdigit():
235235
option = (option[0], int(option[1]))

tests/test_window.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,14 @@ def test_set_show_window_options(session):
174174
window.set_window_option('main-pane-height', 20)
175175
assert window.show_window_options('main-pane-height') == 20
176176

177-
window.set_window_option('pane-border-format', ' #P ')
178-
assert window.show_window_options('pane-border-format') == [' #P ']
179-
180177
window.set_window_option('main-pane-height', 40)
181178
assert window.show_window_options('main-pane-height') == 40
182179
assert window.show_window_options()['main-pane-height'] == 40
183180

181+
if has_gte_version('2.3'):
182+
window.set_window_option('pane-border-format', ' #P ')
183+
assert window.show_window_options('pane-border-format') == ' #P '
184+
184185

185186
def test_empty_window_option_returns_None(session):
186187
window = session.new_window(window_name='test_window')

0 commit comments

Comments
 (0)