Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 21:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

use bools for autoraise

Browse source
This commit is contained in:
Benjamin Peterson 2009-07-23 14:19:08 +00:00
parent beca49953d
commit 39186bcda0
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/webbrowser.py
View file

@ -55,7 +55,7 @@ def get(using=None):
# It is recommended one does "import webbrowser" and uses webbrowser.open(url) # It is recommended one does "import webbrowser" and uses webbrowser.open(url)
# instead of "from webbrowser import *". # instead of "from webbrowser import *".
def open(url, new=0, autoraise=1): def open(url, new=0, autoraise=True):
for name in _tryorder: for name in _tryorder:
browser = get(name) browser = get(name)
if browser.open(url, new, autoraise): if browser.open(url, new, autoraise):
@ -144,7 +144,7 @@ def __init__(self, name=""):
self.name = name self.name = name
self.basename = name self.basename = name
def open(self, url, new=0, autoraise=1): def open(self, url, new=0, autoraise=True):
raise NotImplementedError raise NotImplementedError
def open_new(self, url): def open_new(self, url):
@ -168,7 +168,7 @@ def __init__(self, name):
self.args = name[1:] self.args = name[1:]
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=True):
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:
@ -185,7 +185,7 @@ class BackgroundBrowser(GenericBrowser):
"""Class for all browsers which are to be started in the """Class for all browsers which are to be started in the
background.""" background."""
def open(self, url, new=0, autoraise=1): def open(self, url, new=0, autoraise=True):
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:
@ -216,7 +216,7 @@ def _invoke(self, args, remote, autoraise):
raise_opt = [] raise_opt = []
if remote and self.raise_opts: if remote and self.raise_opts:
# use autoraise argument only for remote invocation # use autoraise argument only for remote invocation
autoraise = int(bool(autoraise)) autoraise = int(autoraise)
opt = self.raise_opts[autoraise] opt = self.raise_opts[autoraise]
if opt: raise_opt = [opt] if opt: raise_opt = [opt]
@ -256,7 +256,7 @@ def _invoke(self, args, remote, autoraise):
else: else:
return not p.wait() return not p.wait()
def open(self, url, new=0, autoraise=1): def open(self, url, new=0, autoraise=True):
if new == 0: if new == 0:
action = self.remote_action action = self.remote_action
elif new == 1: elif new == 1:
@ -340,7 +340,7 @@ class Konqueror(BaseBrowser):
for more information on the Konqueror remote-control interface. for more information on the Konqueror remote-control interface.
""" """
def open(self, url, new=0, autoraise=1): def open(self, url, new=0, autoraise=True):
# XXX Currently I know no way to prevent KFM from opening a new win. # XXX Currently I know no way to prevent KFM from opening a new win.
if new == 2: if new == 2:
action = "newTab" action = "newTab"
@ -428,7 +428,7 @@ def _remote(self, action):
s.close() s.close()
return 1 return 1
def open(self, url, new=0, autoraise=1): def open(self, url, new=0, autoraise=True):
if new: if new:
ok = self._remote("LOADNEW " + url) ok = self._remote("LOADNEW " + url)
else: else:
@ -511,7 +511,7 @@ def register_X_browsers():
if sys.platform[:3] == "win": if sys.platform[:3] == "win":
class WindowsDefault(BaseBrowser): class WindowsDefault(BaseBrowser):
def open(self, url, new=0, autoraise=1): def open(self, url, new=0, autoraise=True):
try: try:
os.startfile(url) os.startfile(url)
except WindowsError: except WindowsError:
@ -545,7 +545,7 @@ def open(self, url, new=0, autoraise=1):
pass pass
else: else:
class InternetConfig(BaseBrowser): class InternetConfig(BaseBrowser):
def open(self, url, new=0, autoraise=1): def open(self, url, new=0, autoraise=True):
ic.launchurl(url) ic.launchurl(url)
return True # Any way to get status? return True # Any way to get status?
@ -566,7 +566,7 @@ class MacOSX(BaseBrowser):
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name
def open(self, url, new=0, autoraise=1): def open(self, url, new=0, autoraise=True):
assert "'" not in url assert "'" not in url
# hack for local urls # hack for local urls
if not ':' in url: if not ':' in url: