Refresh docs
diff --git a/docs/epy/apiclient.http.MediaInMemoryUpload-class.html b/docs/epy/apiclient.http.MediaInMemoryUpload-class.html
index ea37df9..a871d4a 100644
--- a/docs/epy/apiclient.http.MediaInMemoryUpload-class.html
+++ b/docs/epy/apiclient.http.MediaInMemoryUpload-class.html
@@ -56,7 +56,8 @@
 <h1 class="epydoc">Class MediaInMemoryUpload</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_mediainmem" name="class_hierarchy_for_mediainmem">
-<area shape="rect" href="apiclient.http.MediaInMemoryUpload-class.html" title="MediaInMemoryUpload" alt="" coords="5,61,157,88"/>
+<area shape="rect" href="apiclient.http.MediaInMemoryUpload-class.html" title="MediaInMemoryUpload" alt="" coords="5,117,157,144"/>
+<area shape="rect" href="apiclient.http.MediaIoBaseUpload-class.html" title="MediaIoBaseUpload" alt="" coords="13,61,149,88"/>
 <area shape="rect" href="apiclient.http.MediaUpload-class.html" title="MediaUpload" alt="" coords="33,5,129,32"/>
 </map>
   <img src="class_hierarchy_for_mediainmem.gif" alt='' usemap="#class_hierarchy_for_mediainmem" ismap="ismap" class="graph-without-title" />
@@ -66,8 +67,8 @@
 <pre class="literalblock">
 MediaUpload for a chunk of bytes.
 
-Construct a MediaFileUpload and pass as the media_body parameter of the
-method.
+DEPRECATED: Use MediaIoBaseUpload with either io.TextIOBase or StringIO for
+the stream.
 
 </pre>
 
@@ -94,118 +95,11 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaInMemoryUpload-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
-        <span class="summary-sig-arg">body</span>,
-        <span class="summary-sig-arg">mimetype</span>=<span class="summary-sig-default"><code class="variable-quote">'</code><code class="variable-string">application/octet-stream</code><code class="variable-quote">'</code></span>,
-        <span class="summary-sig-arg">chunksize</span>=<span class="summary-sig-default">524288</span>,
-        <span class="summary-sig-arg">resumable</span>=<span class="summary-sig-default">False</span>)</span><br />
-      Create a new MediaBytesUpload.</td>
+          <td><span class="summary-sig"><a href="apiclient.http.MediaInMemoryUpload-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">*args</span>,
+        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+      Create a new MediaInMemoryUpload.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.__init__">source&nbsp;code</a></span>
-            
-          </td>
-        </tr>
-      </table>
-      
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-      <table width="100%" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaInMemoryUpload-class.html#chunksize" class="summary-sig-name">chunksize</a>(<span class="summary-sig-arg">self</span>)</span><br />
-      Chunk size for resumable uploads.</td>
-          <td align="right" valign="top">
-            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.chunksize">source&nbsp;code</a></span>
-            
-          </td>
-        </tr>
-      </table>
-      
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-      <table width="100%" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaInMemoryUpload-class.html#mimetype" class="summary-sig-name">mimetype</a>(<span class="summary-sig-arg">self</span>)</span><br />
-      Mime type of the body.</td>
-          <td align="right" valign="top">
-            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.mimetype">source&nbsp;code</a></span>
-            
-          </td>
-        </tr>
-      </table>
-      
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-      <table width="100%" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaInMemoryUpload-class.html#size" class="summary-sig-name">size</a>(<span class="summary-sig-arg">self</span>)</span><br />
-      Size of upload.</td>
-          <td align="right" valign="top">
-            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.size">source&nbsp;code</a></span>
-            
-          </td>
-        </tr>
-      </table>
-      
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-      <table width="100%" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaInMemoryUpload-class.html#resumable" class="summary-sig-name">resumable</a>(<span class="summary-sig-arg">self</span>)</span><br />
-      Whether this upload is resumable.</td>
-          <td align="right" valign="top">
-            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.resumable">source&nbsp;code</a></span>
-            
-          </td>
-        </tr>
-      </table>
-      
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-      <table width="100%" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaInMemoryUpload-class.html#getbytes" class="summary-sig-name">getbytes</a>(<span class="summary-sig-arg">self</span>,
-        <span class="summary-sig-arg">begin</span>,
-        <span class="summary-sig-arg">length</span>)</span><br />
-      Get bytes from the media.</td>
-          <td align="right" valign="top">
-            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.getbytes">source&nbsp;code</a></span>
-            
-          </td>
-        </tr>
-      </table>
-      
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-      <table width="100%" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaInMemoryUpload-class.html#to_json" class="summary-sig-name">to_json</a>(<span class="summary-sig-arg">self</span>)</span><br />
-      Create a JSON representation of a MediaInMemoryUpload.</td>
-          <td align="right" valign="top">
-            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.to_json">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -215,6 +109,16 @@
   </tr>
   <tr>
     <td colspan="2" class="summary">
+    <p class="indent-wrapped-lines"><b>Inherited from <code><a href="apiclient.http.MediaIoBaseUpload-class.html">MediaIoBaseUpload</a></code></b>:
+      <code><a href="apiclient.http.MediaIoBaseUpload-class.html#chunksize">chunksize</a></code>,
+      <code><a href="apiclient.http.MediaIoBaseUpload-class.html#getbytes">getbytes</a></code>,
+      <code><a href="apiclient.http.MediaIoBaseUpload-class.html#has_stream">has_stream</a></code>,
+      <code><a href="apiclient.http.MediaIoBaseUpload-class.html#mimetype">mimetype</a></code>,
+      <code><a href="apiclient.http.MediaIoBaseUpload-class.html#resumable">resumable</a></code>,
+      <code><a href="apiclient.http.MediaIoBaseUpload-class.html#size">size</a></code>,
+      <code><a href="apiclient.http.MediaIoBaseUpload-class.html#stream">stream</a></code>,
+      <code><a href="apiclient.http.MediaIoBaseUpload-class.html#to_json">to_json</a></code>
+      </p>
     <div class="private">    <p class="indent-wrapped-lines"><b>Inherited from <code><a href="apiclient.http.MediaUpload-class.html">MediaUpload</a></code></b> (private):
       <code><a href="apiclient.http.MediaUpload-class.html#_to_json" onclick="show_private();">_to_json</a></code>
       </p></div>
@@ -260,40 +164,6 @@
     </td>
   </tr>
 </table>
-<!-- ==================== STATIC METHODS ==================== -->
-<a name="section-StaticMethods"></a>
-<table class="summary" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr bgcolor="#70b0f0" class="table-header">
-  <td colspan="2" class="table-header">
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr valign="top">
-        <td align="left"><span class="table-header">Static Methods</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-StaticMethods"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-      <table width="100%" cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td><span class="summary-sig"><a name="from_json"></a><span class="summary-sig-name">from_json</span>(<span class="summary-sig-arg">s</span>)</span></td>
-          <td align="right" valign="top">
-            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.from_json">source&nbsp;code</a></span>
-            
-          </td>
-        </tr>
-      </table>
-      
-    </td>
-  </tr>
-</table>
 <!-- ==================== PROPERTIES ==================== -->
 <a name="section-Properties"></a>
 <table class="summary" border="1" cellpadding="3"
@@ -344,20 +214,20 @@
 <tr><td>
   <table width="100%" cellpadding="0" cellspacing="0" border="0">
   <tr valign="top"><td>
-  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
-        <span class="sig-arg">body</span>,
-        <span class="sig-arg">mimetype</span>=<span class="sig-default"><code class="variable-quote">'</code><code class="variable-string">application/octet-stream</code><code class="variable-quote">'</code></span>,
-        <span class="sig-arg">chunksize</span>=<span class="sig-default">524288</span>,
-        <span class="sig-arg">resumable</span>=<span class="sig-default">False</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">*args</span>,
+        <span class="sig-arg">**kwargs</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.__init__">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
   <pre class="literalblock">
-Create a new MediaBytesUpload.
+Create a new MediaInMemoryUpload.
+
+DEPRECATED: Use MediaIoBaseUpload with either io.TextIOBase or StringIO for
+the stream.
 
 Args:
   body: string, Bytes of body content.
@@ -367,191 +237,20 @@
     used if resumable=True.
   resumable: bool, True if this is a resumable upload. False means upload
     in a single request.
+  
 
 </pre>
   <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@util.positional(2)</code></li>
+    </ul></dd>
     <dt>Overrides:
         object.__init__
     </dt>
   </dl>
 </td></tr></table>
 </div>
-<a name="chunksize"></a>
-<div>
-<table class="details" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
-  <table width="100%" cellpadding="0" cellspacing="0" border="0">
-  <tr valign="top"><td>
-  <h3 class="epydoc"><span class="sig"><span class="sig-name">chunksize</span>(<span class="sig-arg">self</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.chunksize">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-Chunk size for resumable uploads.
-
-Returns:
-  Chunk size in bytes.
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        <a href="apiclient.http.MediaUpload-class.html#chunksize">MediaUpload.chunksize</a>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="mimetype"></a>
-<div>
-<table class="details" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
-  <table width="100%" cellpadding="0" cellspacing="0" border="0">
-  <tr valign="top"><td>
-  <h3 class="epydoc"><span class="sig"><span class="sig-name">mimetype</span>(<span class="sig-arg">self</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.mimetype">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-Mime type of the body.
-
-Returns:
-  Mime type.
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        <a href="apiclient.http.MediaUpload-class.html#mimetype">MediaUpload.mimetype</a>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="size"></a>
-<div>
-<table class="details" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
-  <table width="100%" cellpadding="0" cellspacing="0" border="0">
-  <tr valign="top"><td>
-  <h3 class="epydoc"><span class="sig"><span class="sig-name">size</span>(<span class="sig-arg">self</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.size">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-Size of upload.
-
-Returns:
-  Size of the body, or None of the size is unknown.
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        <a href="apiclient.http.MediaUpload-class.html#size">MediaUpload.size</a>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="resumable"></a>
-<div>
-<table class="details" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
-  <table width="100%" cellpadding="0" cellspacing="0" border="0">
-  <tr valign="top"><td>
-  <h3 class="epydoc"><span class="sig"><span class="sig-name">resumable</span>(<span class="sig-arg">self</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.resumable">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-Whether this upload is resumable.
-
-Returns:
-  True if resumable upload or False.
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        <a href="apiclient.http.MediaUpload-class.html#resumable">MediaUpload.resumable</a>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="getbytes"></a>
-<div>
-<table class="details" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
-  <table width="100%" cellpadding="0" cellspacing="0" border="0">
-  <tr valign="top"><td>
-  <h3 class="epydoc"><span class="sig"><span class="sig-name">getbytes</span>(<span class="sig-arg">self</span>,
-        <span class="sig-arg">begin</span>,
-        <span class="sig-arg">length</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.getbytes">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-Get bytes from the media.
-
-Args:
-  begin: int, offset from beginning of file.
-  length: int, number of bytes to read, starting at begin.
-
-Returns:
-  A string of bytes read. May be shorter than length if EOF was reached
-  first.
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        <a href="apiclient.http.MediaUpload-class.html#getbytes">MediaUpload.getbytes</a>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="to_json"></a>
-<div>
-<table class="details" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
-  <table width="100%" cellpadding="0" cellspacing="0" border="0">
-  <tr valign="top"><td>
-  <h3 class="epydoc"><span class="sig"><span class="sig-name">to_json</span>(<span class="sig-arg">self</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.to_json">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-Create a JSON representation of a MediaInMemoryUpload.
-
-Returns:
-   string, a JSON representation of this instance, suitable to pass to
-   from_json().
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        <a href="apiclient.http.MediaUpload-class.html#to_json">MediaUpload.to_json</a>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
 <br />
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
@@ -576,7 +275,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Fri Aug  3 07:38:26 2012
+    Generated by Epydoc 3.0.1 on Fri Aug 24 11:02:02 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"