Update generated docs.
diff --git a/docs/oauth2client.appengine.html b/docs/oauth2client.appengine.html
index 1a1cedf..72d4be9 100644
--- a/docs/oauth2client.appengine.html
+++ b/docs/oauth2client.appengine.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="oauth2client.html"><font color="#ffffff">oauth2client</font></a>.appengine</strong></big></big></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/oauth2client/appengine.py">/home/jcgregorio/projects/apiclient-release/oauth2client/appengine.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient-release/oauth2client/appengine.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/oauth2client/appengine.py</a></font></td></tr></table>
<p><tt>Utilities for Google App Engine<br>
<br>
Utilities for making it easier to use OAuth 2.0 on Google App Engine.</tt></p>
@@ -27,7 +27,7 @@
<a href="logging.html">logging</a><br>
</td><td width="25%" valign=top><a href="google.appengine.api.memcache.html">google.appengine.api.memcache</a><br>
<a href="pickle.html">pickle</a><br>
-<a href="simplejson.html">simplejson</a><br>
+<a href="json.html">json</a><br>
</td><td width="25%" valign=top><a href="time.html">time</a><br>
<a href="google.appengine.api.users.html">google.appengine.api.users</a><br>
<a href="google.appengine.ext.webapp.html">google.appengine.ext.webapp</a><br>
@@ -69,7 +69,7 @@
</font></dt><dt><font face="helvetica, arial"><a href="oauth2client.appengine.html#FlowProperty">FlowProperty</a>
</font></dt></dl>
</dd>
-<dt><font face="helvetica, arial"><a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a>(<a href="__builtin__.html#object">__builtin__.object</a>)
+<dt><font face="helvetica, arial"><a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a>(<a href="__builtin__.html#object">__builtin__.object</a>)
</font></dt><dd>
<dl>
<dt><font face="helvetica, arial"><a href="oauth2client.appengine.html#OAuth2Handler">OAuth2Handler</a>
@@ -141,8 +141,19 @@
<dl><dt><a name="AppAssertionCredentials-__setstate__"><strong>__setstate__</strong></a>(self, state)</dt><dd><tt>Reconstitute the state of the <a href="__builtin__.html#object">object</a> from being pickled.</tt></dd></dl>
+<dl><dt><a name="AppAssertionCredentials-apply"><strong>apply</strong></a>(self, headers)</dt><dd><tt>Add the authorization to the headers.<br>
+ <br>
+Args:<br>
+ headers: dict, the headers to add the Authorization header to.</tt></dd></dl>
+
<dl><dt><a name="AppAssertionCredentials-authorize"><strong>authorize</strong></a>(self, http)</dt><dd><tt>Authorize an httplib2.Http instance with these credentials.<br>
<br>
+The modified http.request method will add authentication headers to each<br>
+request and will refresh access_tokens when a 401 is received on a<br>
+request. In addition the http.request method has a credentials property,<br>
+http.request.credentials, which is the Credentials <a href="__builtin__.html#object">object</a> that authorized<br>
+it.<br>
+ <br>
Args:<br>
http: An instance of httplib2.Http<br>
or something that acts like it.<br>
@@ -161,6 +172,12 @@
that adds in the Authorization header and then calls the original<br>
version of 'request()'.</tt></dd></dl>
+<dl><dt><a name="AppAssertionCredentials-refresh"><strong>refresh</strong></a>(self, http)</dt><dd><tt>Forces a refresh of the access_token.<br>
+ <br>
+Args:<br>
+ http: httplib2.Http, an http <a href="__builtin__.html#object">object</a> to be used to make the refresh<br>
+ request.</tt></dd></dl>
+
<dl><dt><a name="AppAssertionCredentials-set_store"><strong>set_store</strong></a>(self, store)</dt><dd><tt>Set the <a href="oauth2client.client.html#Storage">Storage</a> for the credential.<br>
<br>
Args:<br>
@@ -607,20 +624,6 @@
True if this value is considered empty in the context of this <a href="google.appengine.ext.db.html#Property">Property</a><br>
type, otherwise False.</tt></dd></dl>
-<dl><dt><a name="CredentialsProperty-get_updated_value_for_datastore"><strong>get_updated_value_for_datastore</strong></a>(self, model_instance)</dt><dd><tt>Determine new value for auto-updated property.<br>
- <br>
-Some properies (e.g. DateTimeProperty, UserProperty) optionally update their<br>
-value on every put(). This call must return the new desired value for such<br>
-properties. For all other properties, this call must return<br>
-AUTO_UPDATE_UNCHANGED.<br>
- <br>
-Args:<br>
- model_instance: Instance to get new value for.<br>
- <br>
-Returns:<br>
- Datastore representation of the new model value in a form that is<br>
- appropriate for storing in the datastore, or AUTO_UPDATE_UNCHANGED.</tt></dd></dl>
-
<hr>
Data descriptors inherited from <a href="google.appengine.ext.db.html#Property">google.appengine.ext.db.Property</a>:<br>
<dl><dt><strong>__dict__</strong></dt>
@@ -706,20 +709,6 @@
Returns:<br>
Default value as provided by <a href="#FlowProperty-__init__">__init__</a>(default).</tt></dd></dl>
-<dl><dt><a name="FlowProperty-get_updated_value_for_datastore"><strong>get_updated_value_for_datastore</strong></a>(self, model_instance)</dt><dd><tt>Determine new value for auto-updated property.<br>
- <br>
-Some properies (e.g. DateTimeProperty, UserProperty) optionally update their<br>
-value on every put(). This call must return the new desired value for such<br>
-properties. For all other properties, this call must return<br>
-AUTO_UPDATE_UNCHANGED.<br>
- <br>
-Args:<br>
- model_instance: Instance to get new value for.<br>
- <br>
-Returns:<br>
- Datastore representation of the new model value in a form that is<br>
- appropriate for storing in the datastore, or AUTO_UPDATE_UNCHANGED.</tt></dd></dl>
-
<hr>
Data descriptors inherited from <a href="google.appengine.ext.db.html#Property">google.appengine.ext.db.Property</a>:<br>
<dl><dt><strong>__dict__</strong></dt>
@@ -802,7 +791,7 @@
<td colspan=2><tt>Utility for making OAuth 2.0 easier.<br>
<br>
Instantiate and then use with oauth_required or oauth_aware<br>
-as decorators on webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a> methods.<br>
+as decorators on webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a> methods.<br>
<br>
Example:<br>
<br>
@@ -812,7 +801,7 @@
scope='https://www.googleapis.com/auth/plus')<br>
<br>
<br>
- class MainHandler(webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>):<br>
+ class MainHandler(webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>):<br>
<br>
@decorator.oauth_required<br>
def get(self):<br>
@@ -821,7 +810,7 @@
# in API calls<br> </tt></td></tr>
<tr><td> </td>
<td width="100%">Methods defined here:<br>
-<dl><dt><a name="OAuth2Decorator-__init__"><strong>__init__</strong></a>(self, client_id, client_secret, scope, auth_uri<font color="#909090">='https://accounts.google.com/o/oauth2/auth'</font>, token_uri<font color="#909090">='https://accounts.google.com/o/oauth2/token'</font>, message<font color="#909090">=None</font>)</dt><dd><tt>Constructor for <a href="#OAuth2Decorator">OAuth2Decorator</a><br>
+<dl><dt><a name="OAuth2Decorator-__init__"><strong>__init__</strong></a>(self, client_id, client_secret, scope, auth_uri<font color="#909090">='https://accounts.google.com/o/oauth2/auth'</font>, token_uri<font color="#909090">='https://accounts.google.com/o/oauth2/token'</font>, user_agent<font color="#909090">=None</font>, message<font color="#909090">=None</font>, **kwargs)</dt><dd><tt>Constructor for <a href="#OAuth2Decorator">OAuth2Decorator</a><br>
<br>
Args:<br>
client_id: string, client identifier.<br>
@@ -832,18 +821,21 @@
defaults to Google's endpoints but any OAuth 2.0 provider can be used.<br>
token_uri: string, URI for token endpoint. For convenience<br>
defaults to Google's endpoints but any OAuth 2.0 provider can be used.<br>
+ user_agent: string, User agent of your application, default to None.<br>
message: Message to display if there are problems with the OAuth 2.0<br>
configuration. The message may contain HTML and will be presented on the<br>
- web interface for any method that uses the decorator.</tt></dd></dl>
+ web interface for any method that uses the decorator.<br>
+ **kwargs: dict, Keyword arguments are be passed along as kwargs to the<br>
+ OAuth2WebServerFlow constructor.</tt></dd></dl>
<dl><dt><a name="OAuth2Decorator-authorize_url"><strong>authorize_url</strong></a>(self)</dt><dd><tt>Returns the URL to start the OAuth dance.<br>
<br>
-Must only be called from with a webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a> subclassed method<br>
+Must only be called from with a webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a> subclassed method<br>
that had been decorated with either @oauth_required or @oauth_aware.</tt></dd></dl>
<dl><dt><a name="OAuth2Decorator-has_credentials"><strong>has_credentials</strong></a>(self)</dt><dd><tt>True if for the logged in user there are valid access Credentials.<br>
<br>
-Must only be called from with a webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a> subclassed method<br>
+Must only be called from with a webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a> subclassed method<br>
that had been decorated with either @oauth_required or @oauth_aware.</tt></dd></dl>
<dl><dt><a name="OAuth2Decorator-http"><strong>http</strong></a>(self)</dt><dd><tt>Returns an authorized http instance.<br>
@@ -861,7 +853,7 @@
and <a href="#OAuth2Decorator-authorize_url">authorize_url</a>() methods can be called.<br>
<br>
Args:<br>
- method: callable, to be decorated method of a webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a><br>
+ method: callable, to be decorated method of a webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a><br>
instance.</tt></dd></dl>
<dl><dt><a name="OAuth2Decorator-oauth_required"><strong>oauth_required</strong></a>(self, method)</dt><dd><tt>Decorator that starts the OAuth 2.0 dance.<br>
@@ -870,7 +862,7 @@
granted access for this application.<br>
<br>
Args:<br>
- method: callable, to be decorated method of a webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a><br>
+ method: callable, to be decorated method of a webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a><br>
instance.</tt></dd></dl>
<hr>
@@ -900,7 +892,7 @@
scope='https://www.googleapis.com/auth/plus')<br>
<br>
<br>
- class MainHandler(webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>):<br>
+ class MainHandler(webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>):<br>
<br>
@decorator.oauth_required<br>
def get(self):<br>
@@ -929,12 +921,12 @@
Methods inherited from <a href="oauth2client.appengine.html#OAuth2Decorator">OAuth2Decorator</a>:<br>
<dl><dt><a name="OAuth2DecoratorFromClientSecrets-authorize_url"><strong>authorize_url</strong></a>(self)</dt><dd><tt>Returns the URL to start the OAuth dance.<br>
<br>
-Must only be called from with a webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a> subclassed method<br>
+Must only be called from with a webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a> subclassed method<br>
that had been decorated with either @oauth_required or @oauth_aware.</tt></dd></dl>
<dl><dt><a name="OAuth2DecoratorFromClientSecrets-has_credentials"><strong>has_credentials</strong></a>(self)</dt><dd><tt>True if for the logged in user there are valid access Credentials.<br>
<br>
-Must only be called from with a webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a> subclassed method<br>
+Must only be called from with a webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a> subclassed method<br>
that had been decorated with either @oauth_required or @oauth_aware.</tt></dd></dl>
<dl><dt><a name="OAuth2DecoratorFromClientSecrets-http"><strong>http</strong></a>(self)</dt><dd><tt>Returns an authorized http instance.<br>
@@ -952,7 +944,7 @@
and <a href="#OAuth2DecoratorFromClientSecrets-authorize_url">authorize_url</a>() methods can be called.<br>
<br>
Args:<br>
- method: callable, to be decorated method of a webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a><br>
+ method: callable, to be decorated method of a webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a><br>
instance.</tt></dd></dl>
<dl><dt><a name="OAuth2DecoratorFromClientSecrets-oauth_required"><strong>oauth_required</strong></a>(self, method)</dt><dd><tt>Decorator that starts the OAuth 2.0 dance.<br>
@@ -961,7 +953,7 @@
granted access for this application.<br>
<br>
Args:<br>
- method: callable, to be decorated method of a webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a><br>
+ method: callable, to be decorated method of a webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a><br>
instance.</tt></dd></dl>
<hr>
@@ -976,14 +968,14 @@
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#ffc8d8">
<td colspan=3 valign=bottom> <br>
-<font color="#000000" face="helvetica, arial"><a name="OAuth2Handler">class <strong>OAuth2Handler</strong></a>(<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a>)</font></td></tr>
+<font color="#000000" face="helvetica, arial"><a name="OAuth2Handler">class <strong>OAuth2Handler</strong></a>(<a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a>)</font></td></tr>
<tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td>
<td colspan=2><tt>Handler for the redirect_uri of the OAuth 2.0 dance.<br> </tt></td></tr>
<tr><td> </td>
<td width="100%"><dl><dt>Method resolution order:</dt>
<dd><a href="oauth2client.appengine.html#OAuth2Handler">OAuth2Handler</a></dd>
-<dd><a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a></dd>
+<dd><a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a></dd>
<dd><a href="__builtin__.html#object">__builtin__.object</a></dd>
</dl>
<hr>
@@ -991,7 +983,7 @@
<dl><dt><a name="OAuth2Handler-get"><strong>get</strong></a> = check_login(self, *args)</dt></dl>
<hr>
-Methods inherited from <a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a>:<br>
+Methods inherited from <a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a>:<br>
<dl><dt><a name="OAuth2Handler-delete"><strong>delete</strong></a>(self, *args)</dt><dd><tt>Handler method for DELETE requests.</tt></dd></dl>
<dl><dt><a name="OAuth2Handler-error"><strong>error</strong></a>(self, code)</dt><dd><tt>Clears the response output stream and sets the given HTTP error code.<br>
@@ -1027,7 +1019,7 @@
<dl><dt><a name="OAuth2Handler-trace"><strong>trace</strong></a>(self, *args)</dt><dd><tt>Handler method for TRACE requests.</tt></dd></dl>
<hr>
-Class methods inherited from <a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a>:<br>
+Class methods inherited from <a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a>:<br>
<dl><dt><a name="OAuth2Handler-get_url"><strong>get_url</strong></a>(cls, *args, **kargs)<font color="#909090"><font face="helvetica, arial"> from <a href="__builtin__.html#type">__builtin__.type</a></font></font></dt><dd><tt>Returns the url for the given handler.<br>
<br>
The default implementation uses the patterns passed to the active<br>
@@ -1065,7 +1057,7 @@
create a set of post handlers that will do simple text transformations<br>
you can write:<br>
<br>
- class ChangeTextHandler(webapp.<a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">RequestHandler</a>):<br>
+ class ChangeTextHandler(webapp.<a href="google.appengine.ext.webapp.html#RequestHandler">RequestHandler</a>):<br>
<br>
def <a href="#OAuth2Handler-__init__">__init__</a>(self, transform):<br>
self.<strong>transform</strong> = transform<br>
@@ -1085,7 +1077,7 @@
Text POSTed to /to_upper will be upper cased.</tt></dd></dl>
<hr>
-Data descriptors inherited from <a href="google.appengine.ext.webapp._webapp25.html#RequestHandler">google.appengine.ext.webapp._webapp25.RequestHandler</a>:<br>
+Data descriptors inherited from <a href="google.appengine.ext.webapp.html#RequestHandler">google.appengine.ext.webapp.RequestHandler</a>:<br>
<dl><dt><strong>__dict__</strong></dt>
<dd><tt>dictionary for instance variables (if defined)</tt></dd>
</dl>
@@ -1122,6 +1114,8 @@
property_name: string, name of the property that is a <a href="#CredentialsProperty">CredentialsProperty</a><br>
cache: memcache, a write-through cache to put in front of the datastore</tt></dd></dl>
+<dl><dt><a name="StorageByKeyName-locked_delete"><strong>locked_delete</strong></a>(self)</dt><dd><tt>Delete Credential from datastore.</tt></dd></dl>
+
<dl><dt><a name="StorageByKeyName-locked_get"><strong>locked_get</strong></a>(self)</dt><dd><tt>Retrieve Credential from datastore.<br>
<br>
Returns:<br>
@@ -1138,6 +1132,14 @@
<br>
This lock is not reentrant.</tt></dd></dl>
+<dl><dt><a name="StorageByKeyName-delete"><strong>delete</strong></a>(self)</dt><dd><tt>Delete credential.<br>
+ <br>
+Frees any resources associated with storing the credential.<br>
+The <a href="oauth2client.client.html#Storage">Storage</a> lock must *not* be held when this is called.<br>
+ <br>
+Returns:<br>
+ None</tt></dd></dl>
+
<dl><dt><a name="StorageByKeyName-get"><strong>get</strong></a>(self)</dt><dd><tt>Retrieve credential.<br>
<br>
The <a href="oauth2client.client.html#Storage">Storage</a> lock must *not* be held when this is called.<br>
@@ -1193,7 +1195,7 @@
<tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td>
<td width="100%"><strong>OAUTH2CLIENT_NAMESPACE</strong> = 'oauth2client#ns'<br>
<strong>__author__</strong> = 'jcgregorio@google.com (Joe Gregorio)'<br>
-<strong>application</strong> = <google.appengine.ext.webapp._webapp25.WSGIApplication object></td></tr></table><p>
+<strong>application</strong> = <google.appengine.ext.webapp.WSGIApplication object></td></tr></table><p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#7799ee">
<td colspan=3 valign=bottom> <br>