@@ -38,18 +38,19 @@ def run_before_script(
38
38
stdout = subprocess .PIPE ,
39
39
cwd = cwd ,
40
40
)
41
- for line in iter (proc .stdout .readline , b"" ):
42
- sys .stdout .write (console_to_str (line ))
41
+ if proc .stdout is not None :
42
+ for line in iter (proc .stdout .readline , b"" ):
43
+ sys .stdout .write (console_to_str (line ))
43
44
proc .wait ()
44
45
45
- if proc .returncode :
46
+ if proc .returncode and proc . stderr is not None :
46
47
stderr = proc .stderr .read ()
47
48
proc .stderr .close ()
48
- stderr = console_to_str (stderr ).split ("\n " )
49
- stderr = "\n " .join (list (filter (None , stderr ))) # filter empty
49
+ stderr_strlist = console_to_str (stderr ).split ("\n " )
50
+ stderr_str = "\n " .join (list (filter (None , stderr_strlist ))) # filter empty
50
51
51
52
raise exc .BeforeLoadScriptError (
52
- proc .returncode , os .path .abspath (script_file ), stderr
53
+ proc .returncode , os .path .abspath (script_file ), stderr_str
53
54
)
54
55
55
56
return proc .returncode
@@ -89,6 +90,7 @@ def get_current_pane(server: "Server") -> t.Optional["Pane"]:
89
90
return [p for p in server .panes if p .pane_id == os .getenv ("TMUX_PANE" )][0 ]
90
91
except IndexError :
91
92
pass
93
+ return
92
94
93
95
94
96
def get_session (
@@ -153,7 +155,7 @@ def get_pane(window: "Window", current_pane: t.Optional["Pane"] = None) -> "Pane
153
155
pane = window .attached_pane # NOQA: F841
154
156
except exc .TmuxpException as e :
155
157
print (e )
156
- return
158
+ return None
157
159
158
160
if pane is None :
159
161
if current_pane :
0 commit comments