Merge remote-tracking branch 'origin/master' into custom_commands2

Conflicts:
	rtv/exceptions.py
This commit is contained in:
Michael Lazar
2016-07-22 23:46:16 -07:00
78 changed files with 55763 additions and 23613 deletions

View File

@@ -496,7 +496,7 @@ class Terminal(object):
try:
with self.suspend():
p = subprocess.Popen([pager], stdin=subprocess.PIPE)
p.stdin.write(self.clean(data))
p.stdin.write(data.encode('utf-8'))
p.stdin.close()
try:
p.wait()
@@ -573,12 +573,12 @@ class Terminal(object):
with self.suspend():
p = subprocess.Popen([urlview], stdin=subprocess.PIPE)
try:
p.communicate(input=six.b(data))
p.communicate(input=data.encode('utf-8'))
except KeyboardInterrupt:
p.terminate()
except OSError:
self.show_notification(
'Could not open urls with {}'.format(urlview))
'Failed to open {0}'.format(urlview))
def text_input(self, window, allow_resize=False):
"""