commit 351b149b14d2dd7f356c56e3344015aba92e46f5
author Joe Gregorio <jcgregorio@google.com> Sun May 08 23:32:46 2011 -0700
committer Joe Gregorio <jcgregorio@google.com> Sun May 08 23:32:46 2011 -0700
tree 0d4b6f75a0adcfe0512043ec923dc7104b2ca73e
parent b9a80929f88cb2a276010a1f1f9500e54cadace9

Version 1.0 beta 2

docs/httplib2.html

diff --git a/docs/httplib2.html b/docs/httplib2.html
index 8be442d..1f68184 100644
--- a/docs/httplib2.html
+++ b/docs/httplib2.html
@@ -8,7 +8,7 @@
 <td valign=bottom>&nbsp;<br>
 <font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>httplib2</strong></big></big> (version $Rev$)</font></td
 ><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/httplib2/__init__.py">/home/jcgregorio/projects/apiclient-release/httplib2/__init__.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/google-api-python-client/httplib2/__init__.py">/home/jcgregorio/projects/google-api-python-client/httplib2/__init__.py</a></font></td></tr></table>
     <p></p>
 <p>
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
@@ -144,9 +144,14 @@
 <td width="100%">Methods defined here:<br>
 <dl><dt><a name="Http-__init__"><strong>__init__</strong></a>(self, cache<font color="#909090">=None</font>, timeout<font color="#909090">=None</font>, proxy_info<font color="#909090">=None</font>)</dt><dd><tt>The&nbsp;value&nbsp;of&nbsp;proxy_info&nbsp;is&nbsp;a&nbsp;<a href="#ProxyInfo">ProxyInfo</a>&nbsp;instance.<br>
 &nbsp;<br>
-If&nbsp;'cache'&nbsp;is&nbsp;a&nbsp;string&nbsp;then&nbsp;it&nbsp;is&nbsp;used&nbsp;as&nbsp;a&nbsp;directory&nbsp;name<br>
-for&nbsp;a&nbsp;disk&nbsp;cache.&nbsp;Otherwise&nbsp;it&nbsp;must&nbsp;be&nbsp;an&nbsp;<a href="__builtin__.html#object">object</a>&nbsp;that&nbsp;supports<br>
-the&nbsp;same&nbsp;interface&nbsp;as&nbsp;FileCache.</tt></dd></dl>
+If&nbsp;'cache'&nbsp;is&nbsp;a&nbsp;string&nbsp;then&nbsp;it&nbsp;is&nbsp;used&nbsp;as&nbsp;a&nbsp;directory&nbsp;name&nbsp;for<br>
+a&nbsp;disk&nbsp;cache.&nbsp;Otherwise&nbsp;it&nbsp;must&nbsp;be&nbsp;an&nbsp;<a href="__builtin__.html#object">object</a>&nbsp;that&nbsp;supports&nbsp;the<br>
+same&nbsp;interface&nbsp;as&nbsp;FileCache.<br>
+&nbsp;<br>
+All&nbsp;timeouts&nbsp;are&nbsp;in&nbsp;seconds.&nbsp;If&nbsp;None&nbsp;is&nbsp;passed&nbsp;for&nbsp;timeout<br>
+then&nbsp;Python's&nbsp;default&nbsp;timeout&nbsp;for&nbsp;sockets&nbsp;will&nbsp;be&nbsp;used.&nbsp;See<br>
+for&nbsp;example&nbsp;the&nbsp;docs&nbsp;of&nbsp;socket.setdefaulttimeout():<br>
+<a href="http://docs.python.org/library/socket.html#socket.setdefaulttimeout">http://docs.python.org/library/socket.html#socket.setdefaulttimeout</a></tt></dd></dl>
 
 <dl><dt><a name="Http-add_certificate"><strong>add_certificate</strong></a>(self, key, cert, domain)</dt><dd><tt>Add&nbsp;a&nbsp;key&nbsp;and&nbsp;cert&nbsp;that&nbsp;will&nbsp;be&nbsp;used<br>
 any&nbsp;time&nbsp;a&nbsp;request&nbsp;requires&nbsp;authentication.</tt></dd></dl>