mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 12:44:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Remove two meaningless, module-level global statements (one of a

Browse source 
non-existent variable :-).

Reflow long lines.
This commit is contained in:
Jeremy Hylton 2001-02-27 18:44:14 +00:00
parent 5e1633365d
commit 8016a4b0af
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/webbrowser.py
View file

@ -57,7 +57,6 @@ def open_new(url): # Marked deprecated. May be removed in 2.1.
# an xterm. # an xterm.
if os.environ.get("TERM") or os.environ.get("DISPLAY"): if os.environ.get("TERM") or os.environ.get("DISPLAY"):
PROCESS_CREATION_DELAY = 4 PROCESS_CREATION_DELAY = 4
global tryorder
_tryorder = ("mozilla","netscape","kfm","grail","links","lynx","w3m") _tryorder = ("mozilla","netscape","kfm","grail","links","lynx","w3m")
def _iscommand(cmd): def _iscommand(cmd):
@ -104,7 +103,9 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"):
def _remote(self, action, autoraise): def _remote(self, action, autoraise):
raise_opt = ("-noraise", "-raise")[autoraise] raise_opt = ("-noraise", "-raise")[autoraise]
cmd = "%s %s -remote '%s' >/dev/null 2>&1" % (self.name, raise_opt, action) cmd = "%s %s -remote '%s' >/dev/null 2>&1" % (self.name,
raise_opt,
action)
rc = os.system(cmd) rc = os.system(cmd)
if rc: if rc:
import time import time
@ -152,7 +153,8 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"):
return not rc return not rc
def open(self, url, new=1, autoraise=1): def open(self, url, new=1, autoraise=1):
# 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.
self._remote("openURL %s" % url) self._remote("openURL %s" % url)
# Deprecated. May be removed in 2.1. # Deprecated. May be removed in 2.1.
@ -171,7 +173,8 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"):
import pwd import pwd
import socket import socket
import tempfile import tempfile
tempdir = os.path.join(tempfile.gettempdir(), ".grail-unix") tempdir = os.path.join(tempfile.gettempdir(),
".grail-unix")
user = pwd.getpwuid(_os.getuid())[0] user = pwd.getpwuid(_os.getuid())[0]
filename = os.path.join(tempdir, user + "-*") filename = os.path.join(tempdir, user + "-*")
maybes = glob.glob(filename) maybes = glob.glob(filename)
@ -216,7 +219,6 @@ if os.environ.get("TERM") or os.environ.get("DISPLAY"):
# #
if sys.platform[:3] == "win": if sys.platform[:3] == "win":
global _tryorder
_tryorder = ("netscape", "windows-default") _tryorder = ("netscape", "windows-default")
class WindowsDefault: class WindowsDefault:
@ -260,7 +262,7 @@ else:
# Optimization: filter out alternatives that aren't available, so we can # Optimization: filter out alternatives that aren't available, so we can
# avoid has_key() tests at runtime. (This may also allow some unused # avoid has_key() tests at runtime. (This may also allow some unused
# classes and class-instance storage to be garbage-collected.) # classes and class-instance storage to be garbage-collected.)
_tryorder = filter(lambda x: _browsers.has_key(x.lower()) or x.find("%s")>-1,\ _tryorder = filter(lambda x: _browsers.has_key(x.lower())
_tryorder) or x.find("%s") > -1, _tryorder)
# end # end