From 56c6cb11a38cfe44819e642196f2deef0ae0e56f Mon Sep 17 00:00:00 2001 From: Sandro Tosi Date: Fri, 1 Jan 2016 14:52:45 +0000 Subject: [PATCH] remove handling of X11BROWSER and CONSOLEBROWSER, obsolete --- debian/changelog | 4 +++- reportbug/urlutils.py | 11 ----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c667a8..61fdcde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,8 +31,10 @@ reportbug (6.6.6) UNRELEASED; urgency=medium - switch from gtkspell (now removed) to gtkspellcheck; Closes: #802387 * man/querybts.1 - remove reference to BROWSER env variable, we use xdg-open; Closes: #690759 + * reportbug/urlutils.py + - remove handling of X11BROWSER and CONSOLEBROWSER, obsolete - -- Sandro Tosi Fri, 01 Jan 2016 14:46:50 +0000 + -- Sandro Tosi Fri, 01 Jan 2016 14:52:18 +0000 reportbug (6.6.5) unstable; urgency=medium diff --git a/reportbug/urlutils.py b/reportbug/urlutils.py index 354dd31..47716e8 100644 --- a/reportbug/urlutils.py +++ b/reportbug/urlutils.py @@ -177,14 +177,3 @@ def launch_browser(url): if webbrowser: webbrowser.open(url) return - - X11BROWSER = os.environ.get('X11BROWSER', 'mozilla-firefox') - CONSOLEBROWSER = os.environ.get('CONSOLEBROWSER', 'lynx') - - if ('DISPLAY' in os.environ and - not os.system('command -v ' + X11BROWSER + ' &> /dev/null')): - cmd = "%s %s &" % (X11BROWSER, commands.mkarg(url)) - else: - cmd = "%s %s" % (CONSOLEBROWSER, commands.mkarg(url)) - - os.system(cmd)