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:06:04 +00:00
parent a1e845084f
commit 0273c84bf0
1 changed files with 7 additions and 7 deletions

View File

@ -18,10 +18,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
@ -162,10 +162,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)
@ -180,7 +180,7 @@ Browser controllers provide these methods which parallel three of the
module-level convenience functions: module-level convenience functions:
.. method:: controller.open(url[, new[, autoraise=True]]) .. method:: controller.open(url[, new=0[, autoraise=True]])
Display *url* using the browser handled by this controller. If *new* is 1, a new Display *url* using the browser handled by this controller. If *new* is 1, a new
browser window is opened if possible. If *new* is 2, a new browser page ("tab") browser window is opened if possible. If *new* is 2, a new browser page ("tab")