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

rtv/__main__.py

@@ -5,7 +5,9 @@ import os
 import sys
 import locale
 import logging
+import warnings
 
+import six
 import praw
 import tornado
 
@@ -34,6 +36,10 @@ def main():
 
     # Squelch SSL warnings
     logging.captureWarnings(True)
+    if six.PY3:
+        # These ones get triggered even when capturing warnings is turned on
+        warnings.simplefilter('ignore', ResourceWarning)
+
     locale.setlocale(locale.LC_ALL, '')
 
     # Set the terminal title

rtv/terminal.py

@@ -585,6 +585,16 @@ class Terminal(object):
                     p.communicate(input=data.encode('utf-8'))
                 except KeyboardInterrupt:
                     p.terminate()
+
+                code = p.poll()
+                if code == 1:
+                    # Clear the "No URLs found." message from stdout
+                    sys.stdout.write("\033[F")
+                    sys.stdout.flush()
+
+            if code == 1:
+                self.show_notification('No URLs found')
+
         except OSError:
             self.show_notification(
                 'Failed to open {0}'.format(urlview))