[Python-checkins] r55792 - in python/trunk: Doc/lib/liburllib2.tex Lib/test/test_urllib2.py Lib/test/test_urllib2net.py Lib/urllib2.py Misc/NEWS

Georg Brandl g.brandl at gmx.net
Wed Jun 6 20:06:03 CEST 2007

facundo.batista schrieb:

>  \begin{itemize}
> @@ -351,12 +356,17 @@
>  \end{itemize}
>  \end{methoddesc}
> -\begin{methoddesc}[OpenerDirector]{open}{url\optional{, data}}
> +\begin{methoddesc}[OpenerDirector]{open}{url\optional{, data}{\optional{, timeout}}}
>  Open the given \var{url} (which can be a request object or a string),
>  optionally passing the given \var{data}.
>  Arguments, return values and exceptions raised are the same as those
>  of \function{urlopen()} (which simply calls the \method{open()} method
> -on the currently installed global \class{OpenerDirector}).
> +on the currently installed global \class{OpenerDirector}).  The optional
> +\var{timeout} parameter specifies a timeout in seconds for the connection 
> +attempt (if not specified, or passed as None, the global default timeout 
> +setting will be used; this actually only work for HTTP, HTTPS, FTP
> +and FTPS connections).
> +

You need a \versionadded for the timeout parameter.  This also applies to
all other locations where you added such a parameter.


Thus spake the Lord: Thou shalt indent with four spaces. No more, no less.
Four shall be the number of spaces thou shalt indent, and the number of thy
indenting shall be four. Eight shalt thou not indent, nor either indent thou
two, excepting that thou then proceed to four. Tabs are right out.

More information about the Python-checkins mailing list