Commit 887c080a authored by Tim Peters's avatar Tim Peters

Whitespace normalization.

parent bde4ad4f
...@@ -132,9 +132,9 @@ def _iscommand(cmd): ...@@ -132,9 +132,9 @@ def _iscommand(cmd):
class BaseBrowser(object): class BaseBrowser(object):
"""Parent class for all browsers. Do not use directly.""" """Parent class for all browsers. Do not use directly."""
args = ['%s'] args = ['%s']
def __init__(self, name=""): def __init__(self, name=""):
self.name = name self.name = name
self.basename = name self.basename = name
...@@ -163,7 +163,7 @@ class GenericBrowser(BaseBrowser): ...@@ -163,7 +163,7 @@ class GenericBrowser(BaseBrowser):
self.basename = os.path.basename(self.name) self.basename = os.path.basename(self.name)
def open(self, url, new=0, autoraise=1): def open(self, url, new=0, autoraise=1):
cmdline = [self.name] + [arg.replace("%s", url) cmdline = [self.name] + [arg.replace("%s", url)
for arg in self.args] for arg in self.args]
try: try:
p = subprocess.Popen(cmdline, close_fds=True) p = subprocess.Popen(cmdline, close_fds=True)
...@@ -209,7 +209,7 @@ class UnixBrowser(BaseBrowser): ...@@ -209,7 +209,7 @@ class UnixBrowser(BaseBrowser):
if opt: raise_opt = [opt] if opt: raise_opt = [opt]
cmdline = [self.name] + raise_opt + args cmdline = [self.name] + raise_opt + args
if remote or self.background: if remote or self.background:
inout = file(os.devnull, "r+") inout = file(os.devnull, "r+")
else: else:
...@@ -220,7 +220,7 @@ class UnixBrowser(BaseBrowser): ...@@ -220,7 +220,7 @@ class UnixBrowser(BaseBrowser):
setsid = getattr(os, 'setsid', None) setsid = getattr(os, 'setsid', None)
if not setsid: if not setsid:
setsid = getattr(os, 'setpgrp', None) setsid = getattr(os, 'setpgrp', None)
p = subprocess.Popen(cmdline, close_fds=True, stdin=inout, p = subprocess.Popen(cmdline, close_fds=True, stdin=inout,
stdout=(self.redirect_stdout and inout or None), stdout=(self.redirect_stdout and inout or None),
stderr=inout, preexec_fn=setsid) stderr=inout, preexec_fn=setsid)
...@@ -257,7 +257,7 @@ class UnixBrowser(BaseBrowser): ...@@ -257,7 +257,7 @@ class UnixBrowser(BaseBrowser):
else: else:
raise Error("Bad 'new' parameter to open(); " + raise Error("Bad 'new' parameter to open(); " +
"expected 0, 1, or 2, got %s" % new) "expected 0, 1, or 2, got %s" % new)
args = [arg.replace("%s", url).replace("%action", action) args = [arg.replace("%s", url).replace("%action", action)
for arg in self.remote_args] for arg in self.remote_args]
success = self._invoke(args, True, autoraise) success = self._invoke(args, True, autoraise)
...@@ -278,7 +278,7 @@ class Mozilla(UnixBrowser): ...@@ -278,7 +278,7 @@ class Mozilla(UnixBrowser):
remote_action = "" remote_action = ""
remote_action_newwin = ",new-window" remote_action_newwin = ",new-window"
remote_action_newtab = ",new-tab" remote_action_newtab = ",new-tab"
background = True background = True
Netscape = Mozilla Netscape = Mozilla
...@@ -334,14 +334,14 @@ class Konqueror(BaseBrowser): ...@@ -334,14 +334,14 @@ class Konqueror(BaseBrowser):
action = "newTab" action = "newTab"
else: else:
action = "openURL" action = "openURL"
devnull = file(os.devnull, "r+") devnull = file(os.devnull, "r+")
# if possible, put browser in separate process group, so # if possible, put browser in separate process group, so
# keyboard interrupts don't affect browser as well as Python # keyboard interrupts don't affect browser as well as Python
setsid = getattr(os, 'setsid', None) setsid = getattr(os, 'setsid', None)
if not setsid: if not setsid:
setsid = getattr(os, 'setpgrp', None) setsid = getattr(os, 'setpgrp', None)
try: try:
p = subprocess.Popen(["kfmclient", action, url], p = subprocess.Popen(["kfmclient", action, url],
close_fds=True, stdin=devnull, close_fds=True, stdin=devnull,
...@@ -366,7 +366,7 @@ class Konqueror(BaseBrowser): ...@@ -366,7 +366,7 @@ class Konqueror(BaseBrowser):
if p.poll() is None: if p.poll() is None:
# Should be running now. # Should be running now.
return True return True
try: try:
p = subprocess.Popen(["kfm", "-d", url], p = subprocess.Popen(["kfm", "-d", url],
close_fds=True, stdin=devnull, close_fds=True, stdin=devnull,
...@@ -550,7 +550,7 @@ if sys.platform == 'darwin': ...@@ -550,7 +550,7 @@ if sys.platform == 'darwin':
# hack for local urls # hack for local urls
if not ':' in url: if not ':' in url:
url = 'file:'+url url = 'file:'+url
# new must be 0 or 1 # new must be 0 or 1
new = int(bool(new)) new = int(bool(new))
if self.name == "default": if self.name == "default":
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment