Merged revisions 77024 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77024 | ezio.melotti | 2009-12-24 05:23:23 +0200 (Thu, 24 Dec 2009) | 9 lines

  Merged revisions 77022 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77022 | ezio.melotti | 2009-12-24 04:54:53 +0200 (Thu, 24 Dec 2009) | 1 line

    Added markup and default arg, fixed example
  ........
................
This commit is contained in:
Ezio Melotti 2009-12-24 03:26:13 +00:00
parent f9d95f7043
commit bbea7dc404
1 changed files with 6 additions and 6 deletions

View File

@ -17,10 +17,10 @@ available. If text-mode browsers are used, the calling process will block until
the user exits the browser. the user exits the browser.
If the environment variable :envvar:`BROWSER` exists, it is interpreted to If the environment variable :envvar:`BROWSER` exists, it is interpreted to
override the platform default list of browsers, as a os.pathsep-separated list override the platform default list of browsers, as a :data:`os.pathsep`-separated
of browsers to try in order. When the value of a list part contains the string list of browsers to try in order. When the value of a list part contains the
``%s``, then it is interpreted as a literal browser command line to be used string ``%s``, then it is interpreted as a literal browser command line to be
with the argument URL substituted for ``%s``; if the part does not contain used with the argument URL substituted for ``%s``; if the part does not contain
``%s``, it is simply interpreted as the name of the browser to launch. [1]_ ``%s``, it is simply interpreted as the name of the browser to launch. [1]_
For non-Unix platforms, or when a remote browser is available on Unix, the For non-Unix platforms, or when a remote browser is available on Unix, the
@ -156,10 +156,10 @@ Notes:
Here are some simple examples:: Here are some simple examples::
url = 'http://www.python.org' url = 'http://www.python.org/'
# Open URL in a new tab, if a browser window is already open. # Open URL in a new tab, if a browser window is already open.
webbrowser.open_new_tab(url + '/doc') webbrowser.open_new_tab(url + 'doc/')
# Open URL in new window, raising the window if possible. # Open URL in new window, raising the window if possible.
webbrowser.open_new(url) webbrowser.open_new(url)