diff options
| author | R David Murray <rdmurray@bitdance.com> | 2012-09-03 16:30:12 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2012-09-03 16:30:12 (GMT) |
| commit | 94dd7cb0c71dd9e43bd79df2281a8baa4f3f76ca (patch) | |
| tree | 6627302e65474c5dc5202fcaf8065b46481d5c3d /Lib | |
| parent | c7dedb09453705210b3126ccc86c1df6f03fa8f3 (diff) | |
| download | cpython-94dd7cb0c71dd9e43bd79df2281a8baa4f3f76ca.zip cpython-94dd7cb0c71dd9e43bd79df2281a8baa4f3f76ca.tar.gz cpython-94dd7cb0c71dd9e43bd79df2281a8baa4f3f76ca.tar.bz2 | |
#15509: If %action substitution produces a null string, drop it.
Patch by Anton Barkovsky, comment addition by me.
This showed up as a bug in 3.3 because the definition for Chrome
produced such an empty string. This fix is tested in 3.3+;
backporting the new test suite is more trouble than it is worth.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/webbrowser.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/webbrowser.py b/Lib/webbrowser.py index 6f967b6..202f34a 100644 --- a/Lib/webbrowser.py +++ b/Lib/webbrowser.py @@ -206,12 +206,18 @@ class UnixBrowser(BaseBrowser): """Parent class for all Unix browsers with remote functionality.""" raise_opts = None + background = False + redirect_stdout = True + # In remote_args, %s will be replaced with the requested URL. %action will + # be replaced depending on the value of 'new' passed to open. + # remote_action is used for new=0 (open). If newwin is not None, it is + # used for new=1 (open_new). If newtab is not None, it is used for + # new=3 (open_new_tab). After both substitutions are made, any empty + # strings in the transformed remote_args list will be removed. remote_args = ['%action', '%s'] remote_action = None remote_action_newwin = None remote_action_newtab = None - background = False - redirect_stdout = True def _invoke(self, args, remote, autoraise): raise_opt = [] @@ -267,6 +273,7 @@ class UnixBrowser(BaseBrowser): args = [arg.replace("%s", url).replace("%action", action) for arg in self.remote_args] + args = [arg for arg in args if arg] success = self._invoke(args, True, autoraise) if not success: # remote invocation failed, try straight way |