KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Redirect std streams to devnull when opening URL

Browse Source
This commit is contained in:
Kovid Goyal 2017-10-20 13:07:48 +05:30
parent 6a42a510bf
commit f947c2eecb
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kitty/utils.py
View File

@ -113,7 +113,7 @@ def x11_dpi():
except Exception: except Exception:
pass pass
try: try:
raw = subprocess.check_output(['xrdb', '-query']) raw = subprocess.check_output(['xrdb', '-query'], stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL)
return parse_xrdb(raw) return parse_xrdb(raw)
except Exception: except Exception:
pass pass
@ -170,7 +170,7 @@ def set_primary_selection(text):
text = text.encode('utf-8') text = text.encode('utf-8')
s = selection_clipboard_funcs()[1] s = selection_clipboard_funcs()[1]
if s is None: if s is None:
p = subprocess.Popen(['xsel', '-i', '-p'], stdin=subprocess.PIPE, stdout=open(os.devnull, 'wb'), stderr=subprocess.STDOUT) p = subprocess.Popen(['xsel', '-i', '-p'], stdin=subprocess.PIPE, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
p.stdin.write(text), p.stdin.close() p.stdin.write(text), p.stdin.close()
p.wait() p.wait()
else: else:
@ -182,7 +182,7 @@ def get_primary_selection():
return '' # There is no primary selection on OS X return '' # There is no primary selection on OS X
g = selection_clipboard_funcs()[0] g = selection_clipboard_funcs()[0]
if g is None: if g is None:
ans = subprocess.check_output(['xsel', '-p'], stderr=open(os.devnull, 'wb'), stdin=open(os.devnull, 'rb')).decode('utf-8') ans = subprocess.check_output(['xsel', '-p'], stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL).decode('utf-8')
if ans: if ans:
# Without this for some reason repeated pastes dont work # Without this for some reason repeated pastes dont work
set_primary_selection(ans) set_primary_selection(ans)
@ -205,13 +205,19 @@ def base64_encode(
return ans return ans
def open_cmd(cmd, arg=None):
if arg is not None:
cmd = list(cmd)
cmd.append(arg)
return subprocess.Popen(cmd, stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).wait()
def open_url(url, program='default'): def open_url(url, program='default'):
if program == 'default': if program == 'default':
cmd = ['open'] if isosx else ['xdg-open'] cmd = ['open'] if isosx else ['xdg-open']
else: else:
cmd = shlex.split(program) cmd = shlex.split(program)
cmd.append(url) return open_cmd(cmd, url)
subprocess.Popen(cmd).wait()
def detach(fork=True, setsid=True, redirect=True): def detach(fork=True, setsid=True, redirect=True):