diff --git a/docs/epy/api-objects.txt b/docs/epy/api-objects.txt
index 055d439..7185073 100644
--- a/docs/epy/api-objects.txt
+++ b/docs/epy/api-objects.txt
@@ -1,31 +1,27 @@
 apiclient	apiclient-module.html
-apiclient.__package__	apiclient-module.html#__package__
 apiclient.discovery	apiclient.discovery-module.html
 apiclient.discovery._createResource	apiclient.discovery-module.html#_createResource
-apiclient.discovery.VARNAME	apiclient.discovery-module.html#VARNAME
-apiclient.discovery._cast	apiclient.discovery-module.html#_cast
 apiclient.discovery.MULTIPLIERS	apiclient.discovery-module.html#MULTIPLIERS
-apiclient.discovery._add_query_parameter	apiclient.discovery-module.html#_add_query_parameter
-apiclient.discovery.__package__	apiclient.discovery-module.html#__package__
+apiclient.discovery.fix_method_name	apiclient.discovery-module.html#fix_method_name
 apiclient.discovery.build	apiclient.discovery-module.html#build
 apiclient.discovery.key2param	apiclient.discovery-module.html#key2param
-apiclient.discovery._media_size_to_long	apiclient.discovery-module.html#_media_size_to_long
-apiclient.discovery.RESERVED_WORDS	apiclient.discovery-module.html#RESERVED_WORDS
+apiclient.discovery.VARNAME	apiclient.discovery-module.html#VARNAME
 apiclient.discovery.logger	apiclient.discovery-module.html#logger
+apiclient.discovery._media_size_to_long	apiclient.discovery-module.html#_media_size_to_long
+apiclient.discovery._add_query_parameter	apiclient.discovery-module.html#_add_query_parameter
+apiclient.discovery._cast	apiclient.discovery-module.html#_cast
 apiclient.discovery.DEFAULT_METHOD_DOC	apiclient.discovery-module.html#DEFAULT_METHOD_DOC
+apiclient.discovery.RESERVED_WORDS	apiclient.discovery-module.html#RESERVED_WORDS
+apiclient.discovery.build_from_document	apiclient.discovery-module.html#build_from_document
 apiclient.discovery.STACK_QUERY_PARAMETERS	apiclient.discovery-module.html#STACK_QUERY_PARAMETERS
-apiclient.discovery.fix_method_name	apiclient.discovery-module.html#fix_method_name
 apiclient.discovery.DISCOVERY_URI	apiclient.discovery-module.html#DISCOVERY_URI
 apiclient.discovery.URITEMPLATE	apiclient.discovery-module.html#URITEMPLATE
 apiclient.errors	apiclient.errors-module.html
-apiclient.errors.__package__	apiclient.errors-module.html#__package__
 apiclient.ext	apiclient.ext-module.html
-apiclient.ext.__package__	apiclient.ext-module.html#__package__
 apiclient.http	apiclient.http-module.html
 apiclient.http.set_user_agent	apiclient.http-module.html#set_user_agent
 apiclient.http.tunnel_patch	apiclient.http-module.html#tunnel_patch
 apiclient.http.DEFAULT_CHUNK_SIZE	apiclient.http-module.html#DEFAULT_CHUNK_SIZE
-apiclient.http.__package__	apiclient.http-module.html#__package__
 apiclient.http.MAX_URI_LENGTH	apiclient.http-module.html#MAX_URI_LENGTH
 apiclient.mimeparse	apiclient.mimeparse-module.html
 apiclient.mimeparse.__credits__	apiclient.mimeparse-module.html#__credits__
@@ -33,7 +29,6 @@
 apiclient.mimeparse.parse_media_range	apiclient.mimeparse-module.html#parse_media_range
 apiclient.mimeparse.best_match	apiclient.mimeparse-module.html#best_match
 apiclient.mimeparse.quality_parsed	apiclient.mimeparse-module.html#quality_parsed
-apiclient.mimeparse.__package__	apiclient.mimeparse-module.html#__package__
 apiclient.mimeparse.__email__	apiclient.mimeparse-module.html#__email__
 apiclient.mimeparse.parse_mime_type	apiclient.mimeparse-module.html#parse_mime_type
 apiclient.mimeparse.quality	apiclient.mimeparse-module.html#quality
@@ -41,38 +36,35 @@
 apiclient.model	apiclient.model-module.html
 apiclient.model._abstract	apiclient.model-module.html#_abstract
 apiclient.model.FLAGS	apiclient.model-module.html#FLAGS
-apiclient.model.__package__	apiclient.model-module.html#__package__
 apiclient.model.makepatch	apiclient.model-module.html#makepatch
 apiclient.schema	apiclient.schema-module.html
-apiclient.schema.__package__	apiclient.schema-module.html#__package__
 oauth2client	oauth2client-module.html
-oauth2client.__package__	oauth2client-module.html#__package__
 oauth2client.anyjson	oauth2client.anyjson-module.html
-oauth2client.anyjson.__package__	oauth2client.anyjson-module.html#__package__
 oauth2client.appengine	oauth2client.appengine-module.html
 oauth2client.appengine._safe_html	oauth2client.appengine-module.html#_safe_html
 oauth2client.appengine._build_state_value	oauth2client.appengine-module.html#_build_state_value
 oauth2client.appengine.XSRF_MEMCACHE_ID	oauth2client.appengine-module.html#XSRF_MEMCACHE_ID
 oauth2client.appengine._parse_state_value	oauth2client.appengine-module.html#_parse_state_value
 oauth2client.appengine.OAUTH2CLIENT_NAMESPACE	oauth2client.appengine-module.html#OAUTH2CLIENT_NAMESPACE
-oauth2client.appengine.__package__	oauth2client.appengine-module.html#__package__
 oauth2client.appengine.logger	oauth2client.appengine-module.html#logger
 oauth2client.appengine._generate_new_xsrf_secret_key	oauth2client.appengine-module.html#_generate_new_xsrf_secret_key
 oauth2client.appengine.xsrf_secret_key	oauth2client.appengine-module.html#xsrf_secret_key
+oauth2client.appengine.oauth2decorator_from_clientsecrets	oauth2client.appengine-module.html#oauth2decorator_from_clientsecrets
 oauth2client.client	oauth2client.client-module.html
 oauth2client.client._extract_id_token	oauth2client.client-module.html#_extract_id_token
 oauth2client.client._cached_http	oauth2client.client-module.html#_cached_http
 oauth2client.client.ID_TOKEN_VERIFICATON_CERTS	oauth2client.client-module.html#ID_TOKEN_VERIFICATON_CERTS
-oauth2client.client.__package__	oauth2client.client-module.html#__package__
-oauth2client.client._abstract	oauth2client.client-module.html#_abstract
+oauth2client.client.credentials_from_clientsecrets_and_code	oauth2client.client-module.html#credentials_from_clientsecrets_and_code
+oauth2client.client.flow_from_clientsecrets	oauth2client.client-module.html#flow_from_clientsecrets
+oauth2client.client.EXPIRY_FORMAT	oauth2client.client-module.html#EXPIRY_FORMAT
 oauth2client.client.logger	oauth2client.client-module.html#logger
+oauth2client.client._abstract	oauth2client.client-module.html#_abstract
 oauth2client.client.OOB_CALLBACK_URN	oauth2client.client-module.html#OOB_CALLBACK_URN
 oauth2client.client._parse_exchange_token_response	oauth2client.client-module.html#_parse_exchange_token_response
 oauth2client.client.HAS_OPENSSL	oauth2client.client-module.html#HAS_OPENSSL
-oauth2client.client.EXPIRY_FORMAT	oauth2client.client-module.html#EXPIRY_FORMAT
 oauth2client.client._urlsafe_b64decode	oauth2client.client-module.html#_urlsafe_b64decode
-oauth2client.client.verify_signed_jwt_with_certs	oauth2client.crypt-module.html#verify_signed_jwt_with_certs
-oauth2client.client.make_signed_jwt	oauth2client.crypt-module.html#make_signed_jwt
+oauth2client.client.verify_id_token	oauth2client.client-module.html#verify_id_token
+oauth2client.client.credentials_from_code	oauth2client.client-module.html#credentials_from_code
 oauth2client.clientsecrets	oauth2client.clientsecrets-module.html
 oauth2client.clientsecrets.load	oauth2client.clientsecrets-module.html#load
 oauth2client.clientsecrets.TYPE_INSTALLED	oauth2client.clientsecrets-module.html#TYPE_INSTALLED
@@ -82,7 +74,6 @@
 oauth2client.clientsecrets.loadfile	oauth2client.clientsecrets-module.html#loadfile
 oauth2client.clientsecrets._loadfile	oauth2client.clientsecrets-module.html#_loadfile
 oauth2client.clientsecrets.loads	oauth2client.clientsecrets-module.html#loads
-oauth2client.clientsecrets.__package__	oauth2client.clientsecrets-module.html#__package__
 oauth2client.crypt	oauth2client.crypt-module.html
 oauth2client.crypt.AUTH_TOKEN_LIFETIME_SECS	oauth2client.crypt-module.html#AUTH_TOKEN_LIFETIME_SECS
 oauth2client.crypt.MAX_TOKEN_LIFETIME_SECS	oauth2client.crypt-module.html#MAX_TOKEN_LIFETIME_SECS
@@ -91,42 +82,36 @@
 oauth2client.crypt._json_encode	oauth2client.crypt-module.html#_json_encode
 oauth2client.crypt.make_signed_jwt	oauth2client.crypt-module.html#make_signed_jwt
 oauth2client.crypt.logger	oauth2client.crypt-module.html#logger
-oauth2client.crypt.__package__	oauth2client.crypt-module.html#__package__
 oauth2client.crypt._urlsafe_b64decode	oauth2client.crypt-module.html#_urlsafe_b64decode
 oauth2client.crypt.verify_signed_jwt_with_certs	oauth2client.crypt-module.html#verify_signed_jwt_with_certs
 oauth2client.django_orm	oauth2client.django_orm-module.html
-oauth2client.django_orm.__package__	oauth2client.django_orm-module.html#__package__
 oauth2client.file	oauth2client.file-module.html
-oauth2client.file.__package__	oauth2client.file-module.html#__package__
 oauth2client.gce	oauth2client.gce-module.html
-oauth2client.gce.__package__	oauth2client.gce-module.html#__package__
 oauth2client.gce.META	oauth2client.gce-module.html#META
 oauth2client.gce.logger	oauth2client.gce-module.html#logger
 oauth2client.keyring_storage	oauth2client.keyring_storage-module.html
-oauth2client.keyring_storage.__package__	oauth2client.keyring_storage-module.html#__package__
 oauth2client.locked_file	oauth2client.locked_file-module.html
+oauth2client.locked_file._FcntlOpener	oauth2client.locked_file-module.html#_FcntlOpener
 oauth2client.locked_file._Win32Opener	oauth2client.locked_file-module.html#_Win32Opener
-oauth2client.locked_file.logger	oauth2client.locked_file-module.html#logger
-oauth2client.locked_file.__package__	oauth2client.locked_file-module.html#__package__
 oauth2client.locked_file.validate_file	oauth2client.locked_file-module.html#validate_file
+oauth2client.locked_file.logger	oauth2client.locked_file-module.html#logger
 oauth2client.multistore_file	oauth2client.multistore_file-module.html
+oauth2client.multistore_file.get_credential_storage	oauth2client.multistore_file-module.html#get_credential_storage
 oauth2client.multistore_file._multistores_lock	oauth2client.multistore_file-module.html#_multistores_lock
 oauth2client.multistore_file._multistores	oauth2client.multistore_file-module.html#_multistores
 oauth2client.multistore_file.logger	oauth2client.multistore_file-module.html#logger
-oauth2client.multistore_file.__package__	oauth2client.multistore_file-module.html#__package__
 oauth2client.tools	oauth2client.tools-module.html
 oauth2client.tools.run	oauth2client.tools-module.html#run
 oauth2client.tools.FLAGS	oauth2client.tools-module.html#FLAGS
-oauth2client.tools.__package__	oauth2client.tools-module.html#__package__
 oauth2client.util	oauth2client.util-module.html
-oauth2client.util.__package__	oauth2client.util-module.html#__package__
 oauth2client.util.positional	oauth2client.util-module.html#positional
 oauth2client.util.FLAGS	oauth2client.util-module.html#FLAGS
 oauth2client.util.logger	oauth2client.util-module.html#logger
 oauth2client.xsrfutil	oauth2client.xsrfutil-module.html
+oauth2client.xsrfutil.validate_token	oauth2client.xsrfutil-module.html#validate_token
 oauth2client.xsrfutil.DEFAULT_TIMEOUT_SECS	oauth2client.xsrfutil-module.html#DEFAULT_TIMEOUT_SECS
-oauth2client.xsrfutil.__package__	oauth2client.xsrfutil-module.html#__package__
 oauth2client.xsrfutil.DELIMITER	oauth2client.xsrfutil-module.html#DELIMITER
+oauth2client.xsrfutil.generate_token	oauth2client.xsrfutil-module.html#generate_token
 apiclient.errors.BatchError	apiclient.errors.BatchError-class.html
 apiclient.errors.BatchError.__str__	apiclient.errors.BatchError-class.html#__str__
 apiclient.errors.BatchError.__repr__	apiclient.errors.BatchError-class.html#__repr__
@@ -246,8 +231,8 @@
 apiclient.model.BaseModel.content_type	apiclient.model.BaseModel-class.html#content_type
 apiclient.model.BaseModel._log_request	apiclient.model.BaseModel-class.html#_log_request
 apiclient.model.BaseModel.response	apiclient.model.BaseModel-class.html#response
-apiclient.model.BaseModel.deserialize	apiclient.model.BaseModel-class.html#deserialize
 apiclient.model.BaseModel.alt_param	apiclient.model.BaseModel-class.html#alt_param
+apiclient.model.BaseModel.deserialize	apiclient.model.BaseModel-class.html#deserialize
 apiclient.model.BaseModel.request	apiclient.model.BaseModel-class.html#request
 apiclient.model.BaseModel.no_content_response	apiclient.model.BaseModel-class.html#no_content_response
 apiclient.model.BaseModel._log_response	apiclient.model.BaseModel-class.html#_log_response
@@ -259,8 +244,8 @@
 apiclient.model.JsonModel.content_type	apiclient.model.JsonModel-class.html#content_type
 apiclient.model.BaseModel._log_request	apiclient.model.BaseModel-class.html#_log_request
 apiclient.model.BaseModel.response	apiclient.model.BaseModel-class.html#response
-apiclient.model.JsonModel.deserialize	apiclient.model.JsonModel-class.html#deserialize
 apiclient.model.JsonModel.alt_param	apiclient.model.JsonModel-class.html#alt_param
+apiclient.model.JsonModel.deserialize	apiclient.model.JsonModel-class.html#deserialize
 apiclient.model.BaseModel.request	apiclient.model.BaseModel-class.html#request
 apiclient.model.JsonModel.no_content_response	apiclient.model.JsonModel-class.html#no_content_response
 apiclient.model.BaseModel._log_response	apiclient.model.BaseModel-class.html#_log_response
@@ -272,8 +257,8 @@
 apiclient.model.MediaModel.content_type	apiclient.model.MediaModel-class.html#content_type
 apiclient.model.BaseModel._log_request	apiclient.model.BaseModel-class.html#_log_request
 apiclient.model.BaseModel.response	apiclient.model.BaseModel-class.html#response
-apiclient.model.MediaModel.deserialize	apiclient.model.MediaModel-class.html#deserialize
 apiclient.model.MediaModel.alt_param	apiclient.model.MediaModel-class.html#alt_param
+apiclient.model.MediaModel.deserialize	apiclient.model.MediaModel-class.html#deserialize
 apiclient.model.BaseModel.request	apiclient.model.BaseModel-class.html#request
 apiclient.model.MediaModel.no_content_response	apiclient.model.MediaModel-class.html#no_content_response
 apiclient.model.BaseModel._log_response	apiclient.model.BaseModel-class.html#_log_response
@@ -288,8 +273,8 @@
 apiclient.model.ProtocolBufferModel.content_type	apiclient.model.ProtocolBufferModel-class.html#content_type
 apiclient.model.BaseModel._log_request	apiclient.model.BaseModel-class.html#_log_request
 apiclient.model.BaseModel.response	apiclient.model.BaseModel-class.html#response
-apiclient.model.ProtocolBufferModel.deserialize	apiclient.model.ProtocolBufferModel-class.html#deserialize
 apiclient.model.ProtocolBufferModel.alt_param	apiclient.model.ProtocolBufferModel-class.html#alt_param
+apiclient.model.ProtocolBufferModel.deserialize	apiclient.model.ProtocolBufferModel-class.html#deserialize
 apiclient.model.BaseModel.request	apiclient.model.BaseModel-class.html#request
 apiclient.model.ProtocolBufferModel.no_content_response	apiclient.model.ProtocolBufferModel-class.html#no_content_response
 apiclient.model.BaseModel._log_response	apiclient.model.BaseModel-class.html#_log_response
@@ -301,8 +286,8 @@
 apiclient.model.RawModel.content_type	apiclient.model.RawModel-class.html#content_type
 apiclient.model.BaseModel._log_request	apiclient.model.BaseModel-class.html#_log_request
 apiclient.model.BaseModel.response	apiclient.model.BaseModel-class.html#response
-apiclient.model.RawModel.deserialize	apiclient.model.RawModel-class.html#deserialize
 apiclient.model.RawModel.alt_param	apiclient.model.RawModel-class.html#alt_param
+apiclient.model.RawModel.deserialize	apiclient.model.RawModel-class.html#deserialize
 apiclient.model.BaseModel.request	apiclient.model.BaseModel-class.html#request
 apiclient.model.RawModel.no_content_response	apiclient.model.RawModel-class.html#no_content_response
 apiclient.model.BaseModel._log_response	apiclient.model.BaseModel-class.html#_log_response
@@ -315,28 +300,15 @@
 apiclient.schema.Schemas.__init__	apiclient.schema.Schemas-class.html#__init__
 apiclient.schema._SchemaToStruct	apiclient.schema._SchemaToStruct-class.html
 apiclient.schema._SchemaToStruct.indent	apiclient.schema._SchemaToStruct-class.html#indent
-apiclient.schema._SchemaToStruct.emit	apiclient.schema._SchemaToStruct-class.html#emit
 apiclient.schema._SchemaToStruct._to_str_impl	apiclient.schema._SchemaToStruct-class.html#_to_str_impl
 apiclient.schema._SchemaToStruct.emitEnd	apiclient.schema._SchemaToStruct-class.html#emitEnd
 apiclient.schema._SchemaToStruct.to_str	apiclient.schema._SchemaToStruct-class.html#to_str
-apiclient.schema._SchemaToStruct.undent	apiclient.schema._SchemaToStruct-class.html#undent
 apiclient.schema._SchemaToStruct.emitBegin	apiclient.schema._SchemaToStruct-class.html#emitBegin
+apiclient.schema._SchemaToStruct.undent	apiclient.schema._SchemaToStruct-class.html#undent
+apiclient.schema._SchemaToStruct.emit	apiclient.schema._SchemaToStruct-class.html#emit
 apiclient.schema._SchemaToStruct.__init__	apiclient.schema._SchemaToStruct-class.html#__init__
-django.db.models.fields.subclassing.SubfieldBase	django.db.models.fields.subclassing.SubfieldBase-class.html
-django.db.models.fields.subclassing.SubfieldBase.__new__	django.db.models.fields.subclassing.SubfieldBase-class.html#__new__
 google.appengine.ext.db.PropertiedClass	google.appengine.ext.db.PropertiedClass-class.html
 google.appengine.ext.db.PropertiedClass.__init__	google.appengine.ext.db.PropertiedClass-class.html#__init__
-mimetools.Message	mimetools.Message-class.html
-mimetools.Message.getmaintype	mimetools.Message-class.html#getmaintype
-mimetools.Message.getsubtype	mimetools.Message-class.html#getsubtype
-mimetools.Message.parseplist	mimetools.Message-class.html#parseplist
-mimetools.Message.__init__	mimetools.Message-class.html#__init__
-mimetools.Message.getparamnames	mimetools.Message-class.html#getparamnames
-mimetools.Message.getencoding	mimetools.Message-class.html#getencoding
-mimetools.Message.getparam	mimetools.Message-class.html#getparam
-mimetools.Message.parsetype	mimetools.Message-class.html#parsetype
-mimetools.Message.getplist	mimetools.Message-class.html#getplist
-mimetools.Message.gettype	mimetools.Message-class.html#gettype
 oauth2client.appengine.AppAssertionCredentials	oauth2client.appengine.AppAssertionCredentials-class.html
 oauth2client.appengine.AppAssertionCredentials.from_json	oauth2client.appengine.AppAssertionCredentials-class.html#from_json
 oauth2client.client.OAuth2Credentials.authorize	oauth2client.client.OAuth2Credentials-class.html#authorize
@@ -359,17 +331,15 @@
 oauth2client.client.OAuth2Credentials.access_token_expired	oauth2client.client.OAuth2Credentials-class.html#access_token_expired
 oauth2client.appengine.CredentialsModel	oauth2client.appengine.CredentialsModel-class.html
 google.appengine.ext.db.Model.__metaclass__	google.appengine.ext.db.PropertiedClass-class.html
-oauth2client.appengine.CredentialsModel._all_properties	oauth2client.appengine.CredentialsModel-class.html#_all_properties
 oauth2client.appengine.CredentialsModel.credentials	oauth2client.appengine.CredentialsModel-class.html#credentials
-oauth2client.appengine.CredentialsModel._properties	oauth2client.appengine.CredentialsModel-class.html#_properties
 oauth2client.appengine.CredentialsProperty	oauth2client.appengine.CredentialsProperty-class.html
 oauth2client.appengine.CredentialsProperty.make_value_from_datastore	oauth2client.appengine.CredentialsProperty-class.html#make_value_from_datastore
-oauth2client.appengine.CredentialsProperty.data_type	oauth2client.client.Credentials-class.html
+oauth2client.appengine.CredentialsProperty.data_type	oauth2client.appengine.CredentialsProperty-class.html#data_type
 oauth2client.appengine.CredentialsProperty.validate	oauth2client.appengine.CredentialsProperty-class.html#validate
 oauth2client.appengine.CredentialsProperty.get_value_for_datastore	oauth2client.appengine.CredentialsProperty-class.html#get_value_for_datastore
 oauth2client.appengine.FlowProperty	oauth2client.appengine.FlowProperty-class.html
 oauth2client.appengine.FlowProperty.make_value_from_datastore	oauth2client.appengine.FlowProperty-class.html#make_value_from_datastore
-oauth2client.appengine.FlowProperty.data_type	oauth2client.client.Flow-class.html
+oauth2client.appengine.FlowProperty.data_type	oauth2client.appengine.FlowProperty-class.html#data_type
 oauth2client.appengine.FlowProperty.validate	oauth2client.appengine.FlowProperty-class.html#validate
 oauth2client.appengine.FlowProperty.empty	oauth2client.appengine.FlowProperty-class.html#empty
 oauth2client.appengine.FlowProperty.get_value_for_datastore	oauth2client.appengine.FlowProperty-class.html#get_value_for_datastore
@@ -401,9 +371,7 @@
 oauth2client.appengine.OAuth2Decorator.oauth_required	oauth2client.appengine.OAuth2Decorator-class.html#oauth_required
 oauth2client.appengine.SiteXsrfSecretKey	oauth2client.appengine.SiteXsrfSecretKey-class.html
 google.appengine.ext.db.Model.__metaclass__	google.appengine.ext.db.PropertiedClass-class.html
-oauth2client.appengine.SiteXsrfSecretKey._all_properties	oauth2client.appengine.SiteXsrfSecretKey-class.html#_all_properties
 oauth2client.appengine.SiteXsrfSecretKey.secret	oauth2client.appengine.SiteXsrfSecretKey-class.html#secret
-oauth2client.appengine.SiteXsrfSecretKey._properties	oauth2client.appengine.SiteXsrfSecretKey-class.html#_properties
 oauth2client.appengine.StorageByKeyName	oauth2client.appengine.StorageByKeyName-class.html
 oauth2client.client.Storage.acquire_lock	oauth2client.client.Storage-class.html#acquire_lock
 oauth2client.appengine.StorageByKeyName.locked_put	oauth2client.appengine.StorageByKeyName-class.html#locked_put
@@ -539,19 +507,17 @@
 oauth2client.crypt.Verifier.from_string	oauth2client.crypt.Verifier-class.html#from_string
 oauth2client.crypt.Verifier.__init__	oauth2client.crypt.Verifier-class.html#__init__
 oauth2client.django_orm.CredentialsField	oauth2client.django_orm.CredentialsField-class.html
-oauth2client.django_orm.CredentialsField.__metaclass__	django.db.models.fields.subclassing.SubfieldBase-class.html
-oauth2client.django_orm.CredentialsField.__init__	oauth2client.django_orm.CredentialsField-class.html#__init__
 oauth2client.django_orm.CredentialsField.get_internal_type	oauth2client.django_orm.CredentialsField-class.html#get_internal_type
-oauth2client.django_orm.CredentialsField.get_db_prep_value	oauth2client.django_orm.CredentialsField-class.html#get_db_prep_value
+oauth2client.django_orm.CredentialsField.__metaclass__	oauth2client.django_orm.CredentialsField-class.html#__metaclass__
 oauth2client.django_orm.CredentialsField.to_python	oauth2client.django_orm.CredentialsField-class.html#to_python
-oauth2client.django_orm.CredentialsField.contribute_to_class	oauth2client.django_orm.CredentialsField-class.html#contribute_to_class
+oauth2client.django_orm.CredentialsField.__init__	oauth2client.django_orm.CredentialsField-class.html#__init__
+oauth2client.django_orm.CredentialsField.get_db_prep_value	oauth2client.django_orm.CredentialsField-class.html#get_db_prep_value
 oauth2client.django_orm.FlowField	oauth2client.django_orm.FlowField-class.html
-oauth2client.django_orm.FlowField.__metaclass__	django.db.models.fields.subclassing.SubfieldBase-class.html
-oauth2client.django_orm.FlowField.__init__	oauth2client.django_orm.FlowField-class.html#__init__
 oauth2client.django_orm.FlowField.get_internal_type	oauth2client.django_orm.FlowField-class.html#get_internal_type
-oauth2client.django_orm.FlowField.get_db_prep_value	oauth2client.django_orm.FlowField-class.html#get_db_prep_value
+oauth2client.django_orm.FlowField.__metaclass__	oauth2client.django_orm.FlowField-class.html#__metaclass__
 oauth2client.django_orm.FlowField.to_python	oauth2client.django_orm.FlowField-class.html#to_python
-oauth2client.django_orm.FlowField.contribute_to_class	oauth2client.django_orm.FlowField-class.html#contribute_to_class
+oauth2client.django_orm.FlowField.__init__	oauth2client.django_orm.FlowField-class.html#__init__
+oauth2client.django_orm.FlowField.get_db_prep_value	oauth2client.django_orm.FlowField-class.html#get_db_prep_value
 oauth2client.django_orm.Storage	oauth2client.django_orm.Storage-class.html
 oauth2client.client.Storage.acquire_lock	oauth2client.client.Storage-class.html#acquire_lock
 oauth2client.django_orm.Storage.locked_put	oauth2client.django_orm.Storage-class.html#locked_put
@@ -614,13 +580,6 @@
 oauth2client.locked_file.LockedFile.unlock_and_close	oauth2client.locked_file.LockedFile-class.html#unlock_and_close
 oauth2client.locked_file.LockedFile.filename	oauth2client.locked_file.LockedFile-class.html#filename
 oauth2client.locked_file.LockedFile.__init__	oauth2client.locked_file.LockedFile-class.html#__init__
-oauth2client.locked_file._FcntlOpener	oauth2client.locked_file._FcntlOpener-class.html
-oauth2client.locked_file._FcntlOpener.open_and_lock	oauth2client.locked_file._FcntlOpener-class.html#open_and_lock
-oauth2client.locked_file._Opener.file_handle	oauth2client.locked_file._Opener-class.html#file_handle
-oauth2client.locked_file._Opener.is_locked	oauth2client.locked_file._Opener-class.html#is_locked
-oauth2client.locked_file._Opener.filename	oauth2client.locked_file._Opener-class.html#filename
-oauth2client.locked_file._FcntlOpener.unlock_and_close	oauth2client.locked_file._FcntlOpener-class.html#unlock_and_close
-oauth2client.locked_file._Opener.__init__	oauth2client.locked_file._Opener-class.html#__init__
 oauth2client.locked_file._Opener	oauth2client.locked_file._Opener-class.html
 oauth2client.locked_file._Opener.open_and_lock	oauth2client.locked_file._Opener-class.html#open_and_lock
 oauth2client.locked_file._Opener.file_handle	oauth2client.locked_file._Opener-class.html#file_handle
@@ -666,6 +625,5 @@
 oauth2client.tools.ClientRedirectHandler	oauth2client.tools.ClientRedirectHandler-class.html
 oauth2client.tools.ClientRedirectHandler.do_GET	oauth2client.tools.ClientRedirectHandler-class.html#do_GET
 oauth2client.tools.ClientRedirectHandler.log_message	oauth2client.tools.ClientRedirectHandler-class.html#log_message
-BaseHTTPServer.BaseHTTPRequestHandler.MessageClass	mimetools.Message-class.html
 oauth2client.tools.ClientRedirectServer	oauth2client.tools.ClientRedirectServer-class.html
 oauth2client.tools.ClientRedirectServer.query_params	oauth2client.tools.ClientRedirectServer-class.html#query_params
diff --git a/docs/epy/apiclient-module.html b/docs/epy/apiclient-module.html
index 8a6efd9..0d915c3 100644
--- a/docs/epy/apiclient-module.html
+++ b/docs/epy/apiclient-module.html
@@ -54,7 +54,7 @@
 <h1 class="epydoc">Package apiclient</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient-pysrc.html">source&nbsp;code</a></span></p>
 <hr />
 <div class="fields">      <p><strong>Version:</strong>
-        1.0c3
+        1.0
       </p>
 </div><!-- ==================== SUBMODULES ==================== -->
 <a name="section-Submodules"></a>
@@ -86,31 +86,6 @@
 </table>
 
 <br />
-<!-- ==================== VARIABLES ==================== -->
-<a name="section-Variables"></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">Variables</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Variables"
-         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">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="None">None</code>
-    </td>
-  </tr>
-</table>
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -134,7 +109,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient-pysrc.html b/docs/epy/apiclient-pysrc.html
index b9eb6a6..08a0982 100644
--- a/docs/epy/apiclient-pysrc.html
+++ b/docs/epy/apiclient-pysrc.html
@@ -52,7 +52,7 @@
 </table>
 <h1 class="epydoc">Source Code for <a href="apiclient-module.html">Package apiclient</a></h1>
 <pre class="py-src">
-<a name="L1"></a><tt class="py-lineno">1</tt>  <tt class="py-line"><tt class="py-name">__version__</tt> <tt class="py-op">=</tt> <tt class="py-docstring">"1.0c3"</tt> </tt>
+<a name="L1"></a><tt class="py-lineno">1</tt>  <tt class="py-line"><tt class="py-name">__version__</tt> <tt class="py-op">=</tt> <tt class="py-docstring">"1.0"</tt> </tt>
 <a name="L2"></a><tt class="py-lineno">2</tt>  <tt class="py-line"> </tt><script type="text/javascript">
 <!--
 expandto(location.href);
@@ -83,7 +83,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.discovery-module.html b/docs/epy/apiclient.discovery-module.html
index f70d106..41a97dc 100644
--- a/docs/epy/apiclient.discovery-module.html
+++ b/docs/epy/apiclient.discovery-module.html
@@ -81,13 +81,13 @@
     </table>
   </td>
 </tr>
-<tr class="private">
+<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.discovery-module.html#fix_method_name" class="summary-sig-name" onclick="show_private();">fix_method_name</a>(<span class="summary-sig-arg">name</span>)</span><br />
+          <td><span class="summary-sig"><a href="apiclient.discovery-module.html#fix_method_name" class="summary-sig-name">fix_method_name</a>(<span class="summary-sig-arg">name</span>)</span><br />
       Fix method names to avoid reserved word conflicts.</td>
           <td align="right" valign="top">
             <span class="codelink"><a href="apiclient.discovery-pysrc.html#fix_method_name">source&nbsp;code</a></span>
@@ -140,11 +140,39 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.discovery-module.html#build" class="summary-sig-name">build</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="apiclient.discovery-module.html#build" class="summary-sig-name">build</a>(<span class="summary-sig-arg">serviceName</span>,
+        <span class="summary-sig-arg">version</span>,
+        <span class="summary-sig-arg">http</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">discoveryServiceUrl</span>=<span class="summary-sig-default">DISCOVERY_URI</span>,
+        <span class="summary-sig-arg">developerKey</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">model</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">requestBuilder</span>=<span class="summary-sig-default">HttpRequest</span>)</span><br />
       Construct a Resource for interacting with an API.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.discovery-pysrc.html#build">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.discovery-module.html#build_from_document" class="summary-sig-name">build_from_document</a>(<span class="summary-sig-arg">service</span>,
+        <span class="summary-sig-arg">base</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">future</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">http</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">developerKey</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">model</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">requestBuilder</span>=<span class="summary-sig-default">HttpRequest</span>)</span><br />
+      Create a Resource for interacting with an API.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="apiclient.discovery-pysrc.html#build_from_document">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -229,75 +257,267 @@
     </table>
   </td>
 </tr>
-<tr class="private">
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="copy"></a><span class="summary-name">copy</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="httplib2"></a><span class="summary-name">httplib2</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="logging"></a><span class="summary-name">logging</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="os"></a><span class="summary-name">os</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="random"></a><span class="summary-name">random</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="re"></a><span class="summary-name">re</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="uritemplate"></a><span class="summary-name">uritemplate</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="urllib"></a><span class="summary-name">urllib</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="urlparse"></a><span class="summary-name">urlparse</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="mimeparse"></a><span class="summary-name">mimeparse</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="mimetypes"></a><span class="summary-name">mimetypes</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="parse_qsl"></a><span class="summary-name">parse_qsl</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="HttpError"></a><span class="summary-name">HttpError</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="InvalidJsonError"></a><span class="summary-name">InvalidJsonError</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="MediaUploadSizeError"></a><span class="summary-name">MediaUploadSizeError</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="UnacceptableMimeTypeError"></a><span class="summary-name">UnacceptableMimeTypeError</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="UnknownApiNameOrVersion"></a><span class="summary-name">UnknownApiNameOrVersion</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="UnknownLinkType"></a><span class="summary-name">UnknownLinkType</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="HttpRequest"></a><span class="summary-name">HttpRequest</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="MediaFileUpload"></a><span class="summary-name">MediaFileUpload</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="MediaUpload"></a><span class="summary-name">MediaUpload</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="JsonModel"></a><span class="summary-name">JsonModel</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="MediaModel"></a><span class="summary-name">MediaModel</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="RawModel"></a><span class="summary-name">RawModel</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="Schemas"></a><span class="summary-name">Schemas</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="MIMEMultipart"></a><span class="summary-name">MIMEMultipart</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="MIMENonMultipart"></a><span class="summary-name">MIMENonMultipart</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="positional"></a><span class="summary-name">positional</span>
+    </td>
+  </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="simplejson"></a><span class="summary-name">simplejson</span>
+    </td>
+  </tr>
+<tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
         <a name="logger"></a><span class="summary-name">logger</span> = <code title="logging.getLogger(__name__)">logging.getLogger(__name__)</code>
     </td>
   </tr>
-<tr class="private">
+<tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="URITEMPLATE"></a><span class="summary-name">URITEMPLATE</span> = <code title="re.compile(r'\{[^\}]*\}')">re.compile(r'\{<code class="re-group">[^</code>\}<code class="re-group">]</code><code class="re-op">*</code>\}')</code>
+        <a name="URITEMPLATE"></a><span class="summary-name">URITEMPLATE</span> = <code title="re.compile('{[^}]*}')">re.compile('{[^}]*}')</code>
     </td>
   </tr>
-<tr class="private">
+<tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="VARNAME"></a><span class="summary-name">VARNAME</span> = <code title="re.compile(r'[a-zA-Z0-9_-]+')">re.compile(r'<code class="re-group">[</code>a<code class="re-op">-</code>zA<code class="re-op">-</code>Z0<code class="re-op">-</code>9_-<code class="re-group">]</code><code class="re-op">+</code>')</code>
+        <a name="VARNAME"></a><span class="summary-name">VARNAME</span> = <code title="re.compile('[a-zA-Z0-9_-]+')">re.compile('[a-zA-Z0-9_-]+')</code>
     </td>
   </tr>
-<tr class="private">
+<tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a href="apiclient.discovery-module.html#DISCOVERY_URI" class="summary-name" onclick="show_private();">DISCOVERY_URI</a> = <code title="'https://www.googleapis.com/discovery/v1/apis/{api}/{apiVersion}/rest'"><code class="variable-quote">'</code><code class="variable-string">https://www.googleapis.com/discovery/v1/apis/</code><code class="variable-ellipsis">...</code></code>
+        <a href="apiclient.discovery-module.html#DISCOVERY_URI" class="summary-name">DISCOVERY_URI</a> = <code title="'https://www.googleapis.com/discovery/v1/apis/' '{api}/{apiVersion}/re\
+st'">'https://www.googleapis.com/discovery/v1/apis/<code class="variable-ellipsis">...</code></code>
     </td>
   </tr>
-<tr class="private">
+<tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="DEFAULT_METHOD_DOC"></a><span class="summary-name">DEFAULT_METHOD_DOC</span> = <code title="'A description of how to use this function'"><code class="variable-quote">'</code><code class="variable-string">A description of how to use this function</code><code class="variable-quote">'</code></code>
+        <a name="DEFAULT_METHOD_DOC"></a><span class="summary-name">DEFAULT_METHOD_DOC</span> = <code title="'A description of how to use this function'">'A description of how to use this function'</code>
     </td>
   </tr>
-<tr class="private">
+<tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="STACK_QUERY_PARAMETERS"></a><span class="summary-name">STACK_QUERY_PARAMETERS</span> = <code title="['trace', 'pp', 'userip', 'strict']"><code class="variable-group">[</code><code class="variable-quote">'</code><code class="variable-string">trace</code><code class="variable-quote">'</code><code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">pp</code><code class="variable-quote">'</code><code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">userip</code><code class="variable-quote">'</code><code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">strict</code><code class="variable-quote">'</code><code class="variable-group">]</code></code>
+        <a name="STACK_QUERY_PARAMETERS"></a><span class="summary-name">STACK_QUERY_PARAMETERS</span> = <code title="['trace', 'pp', 'userip', 'strict']">['trace', 'pp', 'userip', 'strict']</code>
     </td>
   </tr>
-<tr class="private">
+<tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a href="apiclient.discovery-module.html#RESERVED_WORDS" class="summary-name" onclick="show_private();">RESERVED_WORDS</a> = <code title="['and',
- 'assert',
- 'break',
- 'class',
- 'continue',
- 'def',
- 'del',
- 'elif',
-..."><code class="variable-group">[</code><code class="variable-quote">'</code><code class="variable-string">and</code><code class="variable-quote">'</code><code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">assert</code><code class="variable-quote">'</code><code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">break</code><code class="variable-quote">'</code><code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">class</code><code class="variable-quote">'</code><code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">continue</code><code class="variable-ellipsis">...</code></code>
+        <a href="apiclient.discovery-module.html#RESERVED_WORDS" class="summary-name">RESERVED_WORDS</a> = <code title="['and', 'assert', 'break', 'class', 'continue', 'def', 'del', 'elif', \
+'else', 'except', 'exec', 'finally', 'for', 'from', 'global', 'if', 'i\
+mport', 'in', 'is', 'lambda', 'not', 'or', 'pass', 'print', 'raise', '\
+return', 'try', 'while', 'body']">['and', 'assert', 'break', 'class', 'continue<code class="variable-ellipsis">...</code></code>
     </td>
   </tr>
-<tr class="private">
+<tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a href="apiclient.discovery-module.html#MULTIPLIERS" class="summary-name" onclick="show_private();">MULTIPLIERS</a> = <code title="{'GB': 1073741824, 'KB': 1024, 'MB': 1048576, 'TB': 1099511627776}"><code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">GB</code><code class="variable-quote">'</code><code class="variable-op">: </code>1073741824<code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">KB</code><code class="variable-quote">'</code><code class="variable-op">: </code>1024<code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">MB</code><code class="variable-quote">'</code><code class="variable-op">: </code>1048576<code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">T</code><code class="variable-ellipsis">...</code></code>
-    </td>
-  </tr>
-<tr class="private">
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'apiclient'"><code class="variable-quote">'</code><code class="variable-string">apiclient</code><code class="variable-quote">'</code></code>
+        <a href="apiclient.discovery-module.html#MULTIPLIERS" class="summary-name">MULTIPLIERS</a> = <code title="{&quot;KB&quot;: 2** 10, &quot;MB&quot;: 2** 20, &quot;GB&quot;: 2** 30, &quot;TB&quot;: 2** 40,}">{&quot;KB&quot;: 2** 10, &quot;MB&quot;: 2** 20, &quot;GB&quot;: 2** 30, &quot;TB&quot;:<code class="variable-ellipsis">...</code></code>
     </td>
   </tr>
 </table>
@@ -320,7 +540,7 @@
 </tr>
 </table>
 <a name="fix_method_name"></a>
-<div class="private">
+<div>
 <table class="details" border="1" cellpadding="3"
        cellspacing="0" width="100%" bgcolor="white">
 <tr><td>
@@ -418,11 +638,16 @@
 <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">build</span>(<span class="sig-arg">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">build</span>(<span class="sig-arg">serviceName</span>,
+        <span class="sig-arg">version</span>,
+        <span class="sig-arg">http</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">discoveryServiceUrl</span>=<span class="sig-default">DISCOVERY_URI</span>,
+        <span class="sig-arg">developerKey</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">model</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">requestBuilder</span>=<span class="sig-default">HttpRequest</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.discovery-pysrc.html#build">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -454,7 +679,59 @@
   <dl class="fields">
     <dt>Decorators:</dt>
     <dd><ul class="nomargin-top">
-        <li><code>@util.positional(2)</code></li>
+        <li><code>@positional(2)</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
+<a name="build_from_document"></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">build_from_document</span>(<span class="sig-arg">service</span>,
+        <span class="sig-arg">base</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">future</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">http</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">developerKey</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">model</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">requestBuilder</span>=<span class="sig-default">HttpRequest</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="apiclient.discovery-pysrc.html#build_from_document">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+Create a Resource for interacting with an API.
+
+Same as `build()`, but constructs the Resource object from a discovery
+document that is it given, as opposed to retrieving one over HTTP.
+
+Args:
+  service: string, discovery document.
+  base: string, base URI for all HTTP requests, usually the discovery URI.
+    This parameter is no longer used as rootUrl and servicePath are included
+    within the discovery document. (deprecated)
+  future: string, discovery document with future capabilities (deprecated).
+  http: httplib2.Http, An instance of httplib2.Http or something that acts
+    like it that HTTP requests will be made through.
+  developerKey: string, Key for controlling API usage, generated
+    from the API Console.
+  model: Model class instance that serializes and de-serializes requests and
+    responses.
+  requestBuilder: Takes an http request and packages it up to be executed.
+
+Returns:
+  A Resource object with methods for interacting with the service.
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@positional(1)</code></li>
     </ul></dd>
   </dl>
 </td></tr></table>
@@ -588,7 +865,7 @@
 </tr>
 </table>
 <a name="DISCOVERY_URI"></a>
-<div class="private">
+<div>
 <table class="details" border="1" cellpadding="3"
        cellspacing="0" width="100%" bgcolor="white">
 <tr><td>
@@ -599,14 +876,15 @@
   <dl class="fields">
     <dt>Value:</dt>
       <dd><table><tr><td><pre class="variable">
-<code class="variable-quote">'</code><code class="variable-string">https://www.googleapis.com/discovery/v1/apis/{api}/{apiVersion}/rest</code><code class="variable-quote">'</code>
+'https://www.googleapis.com/discovery/v1/apis/' '{api}/{apiVersion}/re<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+st'
 </pre></td></tr></table>
 </dd>
   </dl>
 </td></tr></table>
 </div>
 <a name="RESERVED_WORDS"></a>
-<div class="private">
+<div>
 <table class="details" border="1" cellpadding="3"
        cellspacing="0" width="100%" bgcolor="white">
 <tr><td>
@@ -617,22 +895,17 @@
   <dl class="fields">
     <dt>Value:</dt>
       <dd><table><tr><td><pre class="variable">
-<code class="variable-group">[</code><code class="variable-quote">'</code><code class="variable-string">and</code><code class="variable-quote">'</code><code class="variable-op">,</code>
- <code class="variable-quote">'</code><code class="variable-string">assert</code><code class="variable-quote">'</code><code class="variable-op">,</code>
- <code class="variable-quote">'</code><code class="variable-string">break</code><code class="variable-quote">'</code><code class="variable-op">,</code>
- <code class="variable-quote">'</code><code class="variable-string">class</code><code class="variable-quote">'</code><code class="variable-op">,</code>
- <code class="variable-quote">'</code><code class="variable-string">continue</code><code class="variable-quote">'</code><code class="variable-op">,</code>
- <code class="variable-quote">'</code><code class="variable-string">def</code><code class="variable-quote">'</code><code class="variable-op">,</code>
- <code class="variable-quote">'</code><code class="variable-string">del</code><code class="variable-quote">'</code><code class="variable-op">,</code>
- <code class="variable-quote">'</code><code class="variable-string">elif</code><code class="variable-quote">'</code><code class="variable-op">,</code>
-<code class="variable-ellipsis">...</code>
+['and', 'assert', 'break', 'class', 'continue', 'def', 'del', 'elif', <span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+'else', 'except', 'exec', 'finally', 'for', 'from', 'global', 'if', 'i<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+mport', 'in', 'is', 'lambda', 'not', 'or', 'pass', 'print', 'raise', '<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+return', 'try', 'while', 'body']
 </pre></td></tr></table>
 </dd>
   </dl>
 </td></tr></table>
 </div>
 <a name="MULTIPLIERS"></a>
-<div class="private">
+<div>
 <table class="details" border="1" cellpadding="3"
        cellspacing="0" width="100%" bgcolor="white">
 <tr><td>
@@ -643,7 +916,7 @@
   <dl class="fields">
     <dt>Value:</dt>
       <dd><table><tr><td><pre class="variable">
-<code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">GB</code><code class="variable-quote">'</code><code class="variable-op">: </code>1073741824<code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">KB</code><code class="variable-quote">'</code><code class="variable-op">: </code>1024<code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">MB</code><code class="variable-quote">'</code><code class="variable-op">: </code>1048576<code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">TB</code><code class="variable-quote">'</code><code class="variable-op">: </code>1099511627776<code class="variable-group">}</code>
+{&quot;KB&quot;: 2** 10, &quot;MB&quot;: 2** 20, &quot;GB&quot;: 2** 30, &quot;TB&quot;: 2** 40,}
 </pre></td></tr></table>
 </dd>
   </dl>
@@ -673,7 +946,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.discovery-pysrc.html b/docs/epy/apiclient.discovery-pysrc.html
index f582780..2ca8485 100644
--- a/docs/epy/apiclient.discovery-pysrc.html
+++ b/docs/epy/apiclient.discovery-pysrc.html
@@ -115,29 +115,29 @@
 <a name="L57"></a><tt class="py-lineno"> 57</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt id="link-37" class="py-name"><a title="apiclient" class="py-name" href="#" onclick="return doclink('link-37', 'apiclient', 'link-1');">apiclient</a></tt><tt class="py-op">.</tt><tt id="link-38" class="py-name" targets="Module apiclient.schema=apiclient.schema-module.html"><a title="apiclient.schema" class="py-name" href="#" onclick="return doclink('link-38', 'schema', 'link-38');">schema</a></tt> <tt class="py-keyword">import</tt> <tt id="link-39" class="py-name" targets="Class apiclient.schema.Schemas=apiclient.schema.Schemas-class.html"><a title="apiclient.schema.Schemas" class="py-name" href="#" onclick="return doclink('link-39', 'Schemas', 'link-39');">Schemas</a></tt> </tt>
 <a name="L58"></a><tt class="py-lineno"> 58</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt class="py-name">email</tt><tt class="py-op">.</tt><tt class="py-name">mime</tt><tt class="py-op">.</tt><tt class="py-name">multipart</tt> <tt class="py-keyword">import</tt> <tt class="py-name">MIMEMultipart</tt> </tt>
 <a name="L59"></a><tt class="py-lineno"> 59</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt class="py-name">email</tt><tt class="py-op">.</tt><tt class="py-name">mime</tt><tt class="py-op">.</tt><tt class="py-name">nonmultipart</tt> <tt class="py-keyword">import</tt> <tt class="py-name">MIMENonMultipart</tt> </tt>
-<a name="L60"></a><tt class="py-lineno"> 60</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt id="link-40" class="py-name" targets="Package oauth2client=oauth2client-module.html"><a title="oauth2client" class="py-name" href="#" onclick="return doclink('link-40', 'oauth2client', 'link-40');">oauth2client</a></tt> <tt class="py-keyword">import</tt> <tt id="link-41" class="py-name" targets="Module oauth2client.util=oauth2client.util-module.html"><a title="oauth2client.util" class="py-name" href="#" onclick="return doclink('link-41', 'util', 'link-41');">util</a></tt> </tt>
-<a name="L61"></a><tt class="py-lineno"> 61</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt id="link-42" class="py-name"><a title="oauth2client" class="py-name" href="#" onclick="return doclink('link-42', 'oauth2client', 'link-40');">oauth2client</a></tt><tt class="py-op">.</tt><tt id="link-43" class="py-name" targets="Module oauth2client.anyjson=oauth2client.anyjson-module.html"><a title="oauth2client.anyjson" class="py-name" href="#" onclick="return doclink('link-43', 'anyjson', 'link-43');">anyjson</a></tt> <tt class="py-keyword">import</tt> <tt class="py-name">simplejson</tt> </tt>
+<a name="L60"></a><tt class="py-lineno"> 60</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt id="link-40" class="py-name" targets="Package oauth2client=oauth2client-module.html"><a title="oauth2client" class="py-name" href="#" onclick="return doclink('link-40', 'oauth2client', 'link-40');">oauth2client</a></tt><tt class="py-op">.</tt><tt id="link-41" class="py-name" targets="Module oauth2client.util=oauth2client.util-module.html"><a title="oauth2client.util" class="py-name" href="#" onclick="return doclink('link-41', 'util', 'link-41');">util</a></tt> <tt class="py-keyword">import</tt> <tt id="link-42" class="py-name" targets="Function oauth2client.util.positional()=oauth2client.util-module.html#positional"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-42', 'positional', 'link-42');">positional</a></tt> </tt>
+<a name="L61"></a><tt class="py-lineno"> 61</tt>  <tt class="py-line"><tt class="py-keyword">from</tt> <tt id="link-43" class="py-name"><a title="oauth2client" class="py-name" href="#" onclick="return doclink('link-43', 'oauth2client', 'link-40');">oauth2client</a></tt><tt class="py-op">.</tt><tt id="link-44" class="py-name" targets="Module oauth2client.anyjson=oauth2client.anyjson-module.html"><a title="oauth2client.anyjson" class="py-name" href="#" onclick="return doclink('link-44', 'anyjson', 'link-44');">anyjson</a></tt> <tt class="py-keyword">import</tt> <tt class="py-name">simplejson</tt> </tt>
 <a name="L62"></a><tt class="py-lineno"> 62</tt>  <tt class="py-line"> </tt>
-<a name="L63"></a><tt class="py-lineno"> 63</tt>  <tt class="py-line"><tt id="link-44" class="py-name" targets="Variable apiclient.discovery.logger=apiclient.discovery-module.html#logger,Variable oauth2client.appengine.logger=oauth2client.appengine-module.html#logger,Variable oauth2client.client.logger=oauth2client.client-module.html#logger,Variable oauth2client.crypt.logger=oauth2client.crypt-module.html#logger,Variable oauth2client.gce.logger=oauth2client.gce-module.html#logger,Variable oauth2client.locked_file.logger=oauth2client.locked_file-module.html#logger,Variable oauth2client.multistore_file.logger=oauth2client.multistore_file-module.html#logger,Variable oauth2client.util.logger=oauth2client.util-module.html#logger"><a title="apiclient.discovery.logger
+<a name="L63"></a><tt class="py-lineno"> 63</tt>  <tt class="py-line"><tt id="link-45" class="py-name" targets="Variable apiclient.discovery.logger=apiclient.discovery-module.html#logger,Variable oauth2client.appengine.logger=oauth2client.appengine-module.html#logger,Variable oauth2client.client.logger=oauth2client.client-module.html#logger,Variable oauth2client.crypt.logger=oauth2client.crypt-module.html#logger,Variable oauth2client.gce.logger=oauth2client.gce-module.html#logger,Variable oauth2client.locked_file.logger=oauth2client.locked_file-module.html#logger,Variable oauth2client.multistore_file.logger=oauth2client.multistore_file-module.html#logger,Variable oauth2client.util.logger=oauth2client.util-module.html#logger"><a title="apiclient.discovery.logger
 oauth2client.appengine.logger
 oauth2client.client.logger
 oauth2client.crypt.logger
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-44', 'logger', 'link-44');">logger</a></tt> <tt class="py-op">=</tt> <tt class="py-name">logging</tt><tt class="py-op">.</tt><tt class="py-name">getLogger</tt><tt class="py-op">(</tt><tt class="py-name">__name__</tt><tt class="py-op">)</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-45', 'logger', 'link-45');">logger</a></tt> <tt class="py-op">=</tt> <tt class="py-name">logging</tt><tt class="py-op">.</tt><tt class="py-name">getLogger</tt><tt class="py-op">(</tt><tt class="py-name">__name__</tt><tt class="py-op">)</tt> </tt>
 <a name="L64"></a><tt class="py-lineno"> 64</tt>  <tt class="py-line"> </tt>
-<a name="L65"></a><tt class="py-lineno"> 65</tt>  <tt class="py-line"><tt id="link-45" class="py-name" targets="Variable apiclient.discovery.URITEMPLATE=apiclient.discovery-module.html#URITEMPLATE"><a title="apiclient.discovery.URITEMPLATE" class="py-name" href="#" onclick="return doclink('link-45', 'URITEMPLATE', 'link-45');">URITEMPLATE</a></tt> <tt class="py-op">=</tt> <tt class="py-name">re</tt><tt class="py-op">.</tt><tt class="py-name">compile</tt><tt class="py-op">(</tt><tt class="py-string">'{[^}]*}'</tt><tt class="py-op">)</tt> </tt>
-<a name="L66"></a><tt class="py-lineno"> 66</tt>  <tt class="py-line"><tt id="link-46" class="py-name" targets="Variable apiclient.discovery.VARNAME=apiclient.discovery-module.html#VARNAME"><a title="apiclient.discovery.VARNAME" class="py-name" href="#" onclick="return doclink('link-46', 'VARNAME', 'link-46');">VARNAME</a></tt> <tt class="py-op">=</tt> <tt class="py-name">re</tt><tt class="py-op">.</tt><tt class="py-name">compile</tt><tt class="py-op">(</tt><tt class="py-string">'[a-zA-Z0-9_-]+'</tt><tt class="py-op">)</tt> </tt>
-<a name="L67"></a><tt class="py-lineno"> 67</tt>  <tt class="py-line"><tt id="link-47" class="py-name" targets="Variable apiclient.discovery.DISCOVERY_URI=apiclient.discovery-module.html#DISCOVERY_URI"><a title="apiclient.discovery.DISCOVERY_URI" class="py-name" href="#" onclick="return doclink('link-47', 'DISCOVERY_URI', 'link-47');">DISCOVERY_URI</a></tt> <tt class="py-op">=</tt> <tt class="py-op">(</tt><tt class="py-string">'https://www.googleapis.com/discovery/v1/apis/'</tt> </tt>
+<a name="L65"></a><tt class="py-lineno"> 65</tt>  <tt class="py-line"><tt id="link-46" class="py-name" targets="Variable apiclient.discovery.URITEMPLATE=apiclient.discovery-module.html#URITEMPLATE"><a title="apiclient.discovery.URITEMPLATE" class="py-name" href="#" onclick="return doclink('link-46', 'URITEMPLATE', 'link-46');">URITEMPLATE</a></tt> <tt class="py-op">=</tt> <tt class="py-name">re</tt><tt class="py-op">.</tt><tt class="py-name">compile</tt><tt class="py-op">(</tt><tt class="py-string">'{[^}]*}'</tt><tt class="py-op">)</tt> </tt>
+<a name="L66"></a><tt class="py-lineno"> 66</tt>  <tt class="py-line"><tt id="link-47" class="py-name" targets="Variable apiclient.discovery.VARNAME=apiclient.discovery-module.html#VARNAME"><a title="apiclient.discovery.VARNAME" class="py-name" href="#" onclick="return doclink('link-47', 'VARNAME', 'link-47');">VARNAME</a></tt> <tt class="py-op">=</tt> <tt class="py-name">re</tt><tt class="py-op">.</tt><tt class="py-name">compile</tt><tt class="py-op">(</tt><tt class="py-string">'[a-zA-Z0-9_-]+'</tt><tt class="py-op">)</tt> </tt>
+<a name="L67"></a><tt class="py-lineno"> 67</tt>  <tt class="py-line"><tt id="link-48" class="py-name" targets="Variable apiclient.discovery.DISCOVERY_URI=apiclient.discovery-module.html#DISCOVERY_URI"><a title="apiclient.discovery.DISCOVERY_URI" class="py-name" href="#" onclick="return doclink('link-48', 'DISCOVERY_URI', 'link-48');">DISCOVERY_URI</a></tt> <tt class="py-op">=</tt> <tt class="py-op">(</tt><tt class="py-string">'https://www.googleapis.com/discovery/v1/apis/'</tt> </tt>
 <a name="L68"></a><tt class="py-lineno"> 68</tt>  <tt class="py-line">  <tt class="py-string">'{api}/{apiVersion}/rest'</tt><tt class="py-op">)</tt> </tt>
-<a name="L69"></a><tt class="py-lineno"> 69</tt>  <tt class="py-line"><tt id="link-48" class="py-name" targets="Variable apiclient.discovery.DEFAULT_METHOD_DOC=apiclient.discovery-module.html#DEFAULT_METHOD_DOC"><a title="apiclient.discovery.DEFAULT_METHOD_DOC" class="py-name" href="#" onclick="return doclink('link-48', 'DEFAULT_METHOD_DOC', 'link-48');">DEFAULT_METHOD_DOC</a></tt> <tt class="py-op">=</tt> <tt class="py-string">'A description of how to use this function'</tt> </tt>
+<a name="L69"></a><tt class="py-lineno"> 69</tt>  <tt class="py-line"><tt id="link-49" class="py-name" targets="Variable apiclient.discovery.DEFAULT_METHOD_DOC=apiclient.discovery-module.html#DEFAULT_METHOD_DOC"><a title="apiclient.discovery.DEFAULT_METHOD_DOC" class="py-name" href="#" onclick="return doclink('link-49', 'DEFAULT_METHOD_DOC', 'link-49');">DEFAULT_METHOD_DOC</a></tt> <tt class="py-op">=</tt> <tt class="py-string">'A description of how to use this function'</tt> </tt>
 <a name="L70"></a><tt class="py-lineno"> 70</tt>  <tt class="py-line"> </tt>
 <a name="L71"></a><tt class="py-lineno"> 71</tt>  <tt class="py-line"><tt class="py-comment"># Parameters accepted by the stack, but not visible via discovery.</tt> </tt>
-<a name="L72"></a><tt class="py-lineno"> 72</tt>  <tt class="py-line"><tt id="link-49" class="py-name" targets="Variable apiclient.discovery.STACK_QUERY_PARAMETERS=apiclient.discovery-module.html#STACK_QUERY_PARAMETERS"><a title="apiclient.discovery.STACK_QUERY_PARAMETERS" class="py-name" href="#" onclick="return doclink('link-49', 'STACK_QUERY_PARAMETERS', 'link-49');">STACK_QUERY_PARAMETERS</a></tt> <tt class="py-op">=</tt> <tt class="py-op">[</tt><tt class="py-string">'trace'</tt><tt class="py-op">,</tt> <tt class="py-string">'pp'</tt><tt class="py-op">,</tt> <tt class="py-string">'userip'</tt><tt class="py-op">,</tt> <tt class="py-string">'strict'</tt><tt class="py-op">]</tt> </tt>
+<a name="L72"></a><tt class="py-lineno"> 72</tt>  <tt class="py-line"><tt id="link-50" class="py-name" targets="Variable apiclient.discovery.STACK_QUERY_PARAMETERS=apiclient.discovery-module.html#STACK_QUERY_PARAMETERS"><a title="apiclient.discovery.STACK_QUERY_PARAMETERS" class="py-name" href="#" onclick="return doclink('link-50', 'STACK_QUERY_PARAMETERS', 'link-50');">STACK_QUERY_PARAMETERS</a></tt> <tt class="py-op">=</tt> <tt class="py-op">[</tt><tt class="py-string">'trace'</tt><tt class="py-op">,</tt> <tt class="py-string">'pp'</tt><tt class="py-op">,</tt> <tt class="py-string">'userip'</tt><tt class="py-op">,</tt> <tt class="py-string">'strict'</tt><tt class="py-op">]</tt> </tt>
 <a name="L73"></a><tt class="py-lineno"> 73</tt>  <tt class="py-line"> </tt>
 <a name="L74"></a><tt class="py-lineno"> 74</tt>  <tt class="py-line"><tt class="py-comment"># Python reserved words.</tt> </tt>
-<a name="L75"></a><tt class="py-lineno"> 75</tt>  <tt class="py-line"><tt id="link-50" class="py-name" targets="Variable apiclient.discovery.RESERVED_WORDS=apiclient.discovery-module.html#RESERVED_WORDS"><a title="apiclient.discovery.RESERVED_WORDS" class="py-name" href="#" onclick="return doclink('link-50', 'RESERVED_WORDS', 'link-50');">RESERVED_WORDS</a></tt> <tt class="py-op">=</tt> <tt class="py-op">[</tt><tt class="py-string">'and'</tt><tt class="py-op">,</tt> <tt class="py-string">'assert'</tt><tt class="py-op">,</tt> <tt class="py-string">'break'</tt><tt class="py-op">,</tt> <tt class="py-string">'class'</tt><tt class="py-op">,</tt> <tt class="py-string">'continue'</tt><tt class="py-op">,</tt> <tt class="py-string">'def'</tt><tt class="py-op">,</tt> <tt class="py-string">'del'</tt><tt class="py-op">,</tt> </tt>
+<a name="L75"></a><tt class="py-lineno"> 75</tt>  <tt class="py-line"><tt id="link-51" class="py-name" targets="Variable apiclient.discovery.RESERVED_WORDS=apiclient.discovery-module.html#RESERVED_WORDS"><a title="apiclient.discovery.RESERVED_WORDS" class="py-name" href="#" onclick="return doclink('link-51', 'RESERVED_WORDS', 'link-51');">RESERVED_WORDS</a></tt> <tt class="py-op">=</tt> <tt class="py-op">[</tt><tt class="py-string">'and'</tt><tt class="py-op">,</tt> <tt class="py-string">'assert'</tt><tt class="py-op">,</tt> <tt class="py-string">'break'</tt><tt class="py-op">,</tt> <tt class="py-string">'class'</tt><tt class="py-op">,</tt> <tt class="py-string">'continue'</tt><tt class="py-op">,</tt> <tt class="py-string">'def'</tt><tt class="py-op">,</tt> <tt class="py-string">'del'</tt><tt class="py-op">,</tt> </tt>
 <a name="L76"></a><tt class="py-lineno"> 76</tt>  <tt class="py-line">                  <tt class="py-string">'elif'</tt><tt class="py-op">,</tt> <tt class="py-string">'else'</tt><tt class="py-op">,</tt> <tt class="py-string">'except'</tt><tt class="py-op">,</tt> <tt class="py-string">'exec'</tt><tt class="py-op">,</tt> <tt class="py-string">'finally'</tt><tt class="py-op">,</tt> <tt class="py-string">'for'</tt><tt class="py-op">,</tt> <tt class="py-string">'from'</tt><tt class="py-op">,</tt> </tt>
 <a name="L77"></a><tt class="py-lineno"> 77</tt>  <tt class="py-line">                  <tt class="py-string">'global'</tt><tt class="py-op">,</tt> <tt class="py-string">'if'</tt><tt class="py-op">,</tt> <tt class="py-string">'import'</tt><tt class="py-op">,</tt> <tt class="py-string">'in'</tt><tt class="py-op">,</tt> <tt class="py-string">'is'</tt><tt class="py-op">,</tt> <tt class="py-string">'lambda'</tt><tt class="py-op">,</tt> <tt class="py-string">'not'</tt><tt class="py-op">,</tt> <tt class="py-string">'or'</tt><tt class="py-op">,</tt> </tt>
 <a name="L78"></a><tt class="py-lineno"> 78</tt>  <tt class="py-line">                  <tt class="py-string">'pass'</tt><tt class="py-op">,</tt> <tt class="py-string">'print'</tt><tt class="py-op">,</tt> <tt class="py-string">'raise'</tt><tt class="py-op">,</tt> <tt class="py-string">'return'</tt><tt class="py-op">,</tt> <tt class="py-string">'try'</tt><tt class="py-op">,</tt> <tt class="py-string">'while'</tt><tt class="py-op">,</tt> <tt class="py-string">'body'</tt><tt class="py-op">]</tt> </tt>
@@ -152,7 +152,7 @@
 <a name="L87"></a><tt class="py-lineno"> 87</tt>  <tt class="py-line"><tt class="py-docstring">  Returns:</tt> </tt>
 <a name="L88"></a><tt class="py-lineno"> 88</tt>  <tt class="py-line"><tt class="py-docstring">    The name with a '_' prefixed if the name is a reserved word.</tt> </tt>
 <a name="L89"></a><tt class="py-lineno"> 89</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
-<a name="L90"></a><tt class="py-lineno"> 90</tt>  <tt class="py-line">  <tt class="py-keyword">if</tt> <tt class="py-name">name</tt> <tt class="py-keyword">in</tt> <tt id="link-51" class="py-name"><a title="apiclient.discovery.RESERVED_WORDS" class="py-name" href="#" onclick="return doclink('link-51', 'RESERVED_WORDS', 'link-50');">RESERVED_WORDS</a></tt><tt class="py-op">:</tt> </tt>
+<a name="L90"></a><tt class="py-lineno"> 90</tt>  <tt class="py-line">  <tt class="py-keyword">if</tt> <tt class="py-name">name</tt> <tt class="py-keyword">in</tt> <tt id="link-52" class="py-name"><a title="apiclient.discovery.RESERVED_WORDS" class="py-name" href="#" onclick="return doclink('link-52', 'RESERVED_WORDS', 'link-51');">RESERVED_WORDS</a></tt><tt class="py-op">:</tt> </tt>
 <a name="L91"></a><tt class="py-lineno"> 91</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">name</tt> <tt class="py-op">+</tt> <tt class="py-string">'_'</tt> </tt>
 <a name="L92"></a><tt class="py-lineno"> 92</tt>  <tt class="py-line">  <tt class="py-keyword">else</tt><tt class="py-op">:</tt> </tt>
 <a name="L93"></a><tt class="py-lineno"> 93</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">name</tt> </tt>
@@ -205,11 +205,11 @@
 <a name="L140"></a><tt class="py-lineno">140</tt>  <tt class="py-line">  <tt class="py-keyword">return</tt> <tt class="py-string">''</tt><tt class="py-op">.</tt><tt class="py-name">join</tt><tt class="py-op">(</tt><tt class="py-name">result</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L141"></a><tt class="py-lineno">141</tt>  <tt class="py-line"> </tt>
 <a name="build"></a><div id="build-def"><a name="L142"></a><tt class="py-lineno">142</tt>  <tt class="py-line"> </tt>
-<a name="L143"></a><tt class="py-lineno">143</tt>  <tt class="py-line"><tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-52" class="py-name" targets="Function oauth2client.util.positional()=oauth2client.util-module.html#positional"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-52', 'positional', 'link-52');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">2</tt><tt class="py-op">)</tt> </tt>
+<a name="L143"></a><tt class="py-lineno">143</tt>  <tt class="py-line"><tt class="py-decorator">@</tt><tt class="py-decorator">positional</tt><tt class="py-op">(</tt><tt class="py-number">2</tt><tt class="py-op">)</tt> </tt>
 <a name="L144"></a><tt class="py-lineno">144</tt> <a class="py-toggle" href="#" id="build-toggle" onclick="return toggle('build');">-</a><tt class="py-line"><tt class="py-keyword">def</tt> <a class="py-def-name" href="apiclient.discovery-module.html#build">build</a><tt class="py-op">(</tt><tt class="py-param">serviceName</tt><tt class="py-op">,</tt> </tt>
 <a name="L145"></a><tt class="py-lineno">145</tt>  <tt class="py-line">          <tt class="py-param">version</tt><tt class="py-op">,</tt> </tt>
 <a name="L146"></a><tt class="py-lineno">146</tt>  <tt class="py-line">          <tt class="py-param">http</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">,</tt> </tt>
-<a name="L147"></a><tt class="py-lineno">147</tt>  <tt class="py-line">          <tt class="py-param">discoveryServiceUrl</tt><tt class="py-op">=</tt><tt id="link-53" class="py-name"><a title="apiclient.discovery.DISCOVERY_URI" class="py-name" href="#" onclick="return doclink('link-53', 'DISCOVERY_URI', 'link-47');">DISCOVERY_URI</a></tt><tt class="py-op">,</tt> </tt>
+<a name="L147"></a><tt class="py-lineno">147</tt>  <tt class="py-line">          <tt class="py-param">discoveryServiceUrl</tt><tt class="py-op">=</tt><tt id="link-53" class="py-name"><a title="apiclient.discovery.DISCOVERY_URI" class="py-name" href="#" onclick="return doclink('link-53', 'DISCOVERY_URI', 'link-48');">DISCOVERY_URI</a></tt><tt class="py-op">,</tt> </tt>
 <a name="L148"></a><tt class="py-lineno">148</tt>  <tt class="py-line">          <tt class="py-param">developerKey</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">,</tt> </tt>
 <a name="L149"></a><tt class="py-lineno">149</tt>  <tt class="py-line">          <tt class="py-param">model</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">,</tt> </tt>
 <a name="L150"></a><tt class="py-lineno">150</tt>  <tt class="py-line">          <tt class="py-param">requestBuilder</tt><tt class="py-op">=</tt><tt id="link-54" class="py-name"><a title="apiclient.http.HttpRequest" class="py-name" href="#" onclick="return doclink('link-54', 'HttpRequest', 'link-21');">HttpRequest</a></tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
@@ -262,7 +262,7 @@
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-58', 'logger', 'link-44');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">'URL being requested: %s'</tt> <tt class="py-op">%</tt> <tt class="py-name">requested_url</tt><tt class="py-op">)</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-58', 'logger', 'link-45');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">'URL being requested: %s'</tt> <tt class="py-op">%</tt> <tt class="py-name">requested_url</tt><tt class="py-op">)</tt> </tt>
 <a name="L192"></a><tt class="py-lineno">192</tt>  <tt class="py-line"> </tt>
 <a name="L193"></a><tt class="py-lineno">193</tt>  <tt class="py-line">  <tt class="py-name">resp</tt><tt class="py-op">,</tt> <tt class="py-name">content</tt> <tt class="py-op">=</tt> <tt id="link-59" class="py-name"><a title="apiclient.http
 oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-59', 'http', 'link-20');">http</a></tt><tt class="py-op">.</tt><tt id="link-60" class="py-name" targets="Method apiclient.http.HttpMock.request()=apiclient.http.HttpMock-class.html#request,Method apiclient.http.HttpMockSequence.request()=apiclient.http.HttpMockSequence-class.html#request,Method apiclient.model.BaseModel.request()=apiclient.model.BaseModel-class.html#request,Method apiclient.model.Model.request()=apiclient.model.Model-class.html#request"><a title="apiclient.http.HttpMock.request
@@ -286,16 +286,16 @@
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-64', 'logger', 'link-44');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">error</tt><tt class="py-op">(</tt><tt class="py-string">'Failed to parse as JSON: '</tt> <tt class="py-op">+</tt> <tt class="py-name">content</tt><tt class="py-op">)</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-64', 'logger', 'link-45');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">error</tt><tt class="py-op">(</tt><tt class="py-string">'Failed to parse as JSON: '</tt> <tt class="py-op">+</tt> <tt class="py-name">content</tt><tt class="py-op">)</tt> </tt>
 <a name="L205"></a><tt class="py-lineno">205</tt>  <tt class="py-line">    <tt class="py-keyword">raise</tt> <tt id="link-65" class="py-name"><a title="apiclient.errors.InvalidJsonError" class="py-name" href="#" onclick="return doclink('link-65', 'InvalidJsonError', 'link-6');">InvalidJsonError</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L206"></a><tt class="py-lineno">206</tt>  <tt class="py-line"> </tt>
-<a name="L207"></a><tt class="py-lineno">207</tt>  <tt class="py-line">  <tt class="py-keyword">return</tt> <tt class="py-name">build_from_document</tt><tt class="py-op">(</tt><tt class="py-name">content</tt><tt class="py-op">,</tt> <tt class="py-name">base</tt><tt class="py-op">=</tt><tt class="py-name">discoveryServiceUrl</tt><tt class="py-op">,</tt> <tt id="link-66" class="py-name"><a title="apiclient.http
-oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-66', 'http', 'link-20');">http</a></tt><tt class="py-op">=</tt><tt id="link-67" class="py-name"><a title="apiclient.http
-oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-67', 'http', 'link-20');">http</a></tt><tt class="py-op">,</tt> </tt>
-<a name="L208"></a><tt class="py-lineno">208</tt>  <tt class="py-line">      <tt class="py-name">developerKey</tt><tt class="py-op">=</tt><tt class="py-name">developerKey</tt><tt class="py-op">,</tt> <tt id="link-68" class="py-name"><a title="apiclient.model" class="py-name" href="#" onclick="return doclink('link-68', 'model', 'link-29');">model</a></tt><tt class="py-op">=</tt><tt id="link-69" class="py-name"><a title="apiclient.model" class="py-name" href="#" onclick="return doclink('link-69', 'model', 'link-29');">model</a></tt><tt class="py-op">,</tt> <tt class="py-name">requestBuilder</tt><tt class="py-op">=</tt><tt class="py-name">requestBuilder</tt><tt class="py-op">)</tt> </tt>
+<a name="L207"></a><tt class="py-lineno">207</tt>  <tt class="py-line">  <tt class="py-keyword">return</tt> <tt id="link-66" class="py-name" targets="Function apiclient.discovery.build_from_document()=apiclient.discovery-module.html#build_from_document"><a title="apiclient.discovery.build_from_document" class="py-name" href="#" onclick="return doclink('link-66', 'build_from_document', 'link-66');">build_from_document</a></tt><tt class="py-op">(</tt><tt class="py-name">content</tt><tt class="py-op">,</tt> <tt class="py-name">base</tt><tt class="py-op">=</tt><tt class="py-name">discoveryServiceUrl</tt><tt class="py-op">,</tt> <tt id="link-67" class="py-name"><a title="apiclient.http
+oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-67', 'http', 'link-20');">http</a></tt><tt class="py-op">=</tt><tt id="link-68" class="py-name"><a title="apiclient.http
+oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-68', 'http', 'link-20');">http</a></tt><tt class="py-op">,</tt> </tt>
+<a name="L208"></a><tt class="py-lineno">208</tt>  <tt class="py-line">      <tt class="py-name">developerKey</tt><tt class="py-op">=</tt><tt class="py-name">developerKey</tt><tt class="py-op">,</tt> <tt id="link-69" class="py-name"><a title="apiclient.model" class="py-name" href="#" onclick="return doclink('link-69', 'model', 'link-29');">model</a></tt><tt class="py-op">=</tt><tt id="link-70" class="py-name"><a title="apiclient.model" class="py-name" href="#" onclick="return doclink('link-70', 'model', 'link-29');">model</a></tt><tt class="py-op">,</tt> <tt class="py-name">requestBuilder</tt><tt class="py-op">=</tt><tt class="py-name">requestBuilder</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L209"></a><tt class="py-lineno">209</tt>  <tt class="py-line"> </tt>
 <a name="build_from_document"></a><div id="build_from_document-def"><a name="L210"></a><tt class="py-lineno">210</tt>  <tt class="py-line"> </tt>
-<a name="L211"></a><tt class="py-lineno">211</tt>  <tt class="py-line"><tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-70" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-70', 'positional', 'link-52');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">1</tt><tt class="py-op">)</tt> </tt>
+<a name="L211"></a><tt class="py-lineno">211</tt>  <tt class="py-line"><tt class="py-decorator">@</tt><tt class="py-decorator">positional</tt><tt class="py-op">(</tt><tt class="py-number">1</tt><tt class="py-op">)</tt> </tt>
 <a name="L212"></a><tt class="py-lineno">212</tt> <a class="py-toggle" href="#" id="build_from_document-toggle" onclick="return toggle('build_from_document');">-</a><tt class="py-line"><tt class="py-keyword">def</tt> <a class="py-def-name" href="apiclient.discovery-module.html#build_from_document">build_from_document</a><tt class="py-op">(</tt> </tt>
 <a name="L213"></a><tt class="py-lineno">213</tt>  <tt class="py-line">    <tt class="py-param">service</tt><tt class="py-op">,</tt> </tt>
 <a name="L214"></a><tt class="py-lineno">214</tt>  <tt class="py-line">    <tt class="py-param">base</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">,</tt> </tt>
@@ -486,7 +486,7 @@
 <a name="L381"></a><tt class="py-lineno">381</tt>  <tt class="py-line">      <tt class="py-name">methodDesc</tt><tt class="py-op">[</tt><tt class="py-string">'parameters'</tt><tt class="py-op">]</tt><tt class="py-op">[</tt><tt class="py-name">name</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt class="py-name">desc</tt> </tt>
 <a name="L382"></a><tt class="py-lineno">382</tt>  <tt class="py-line"> </tt>
 <a name="L383"></a><tt class="py-lineno">383</tt>  <tt class="py-line">    <tt class="py-comment"># Add in undocumented query parameters.</tt> </tt>
-<a name="L384"></a><tt class="py-lineno">384</tt>  <tt class="py-line">    <tt class="py-keyword">for</tt> <tt class="py-name">name</tt> <tt class="py-keyword">in</tt> <tt id="link-94" class="py-name"><a title="apiclient.discovery.STACK_QUERY_PARAMETERS" class="py-name" href="#" onclick="return doclink('link-94', 'STACK_QUERY_PARAMETERS', 'link-49');">STACK_QUERY_PARAMETERS</a></tt><tt class="py-op">:</tt> </tt>
+<a name="L384"></a><tt class="py-lineno">384</tt>  <tt class="py-line">    <tt class="py-keyword">for</tt> <tt class="py-name">name</tt> <tt class="py-keyword">in</tt> <tt id="link-94" class="py-name"><a title="apiclient.discovery.STACK_QUERY_PARAMETERS" class="py-name" href="#" onclick="return doclink('link-94', 'STACK_QUERY_PARAMETERS', 'link-50');">STACK_QUERY_PARAMETERS</a></tt><tt class="py-op">:</tt> </tt>
 <a name="L385"></a><tt class="py-lineno">385</tt>  <tt class="py-line">      <tt class="py-name">methodDesc</tt><tt class="py-op">[</tt><tt class="py-string">'parameters'</tt><tt class="py-op">]</tt><tt class="py-op">[</tt><tt class="py-name">name</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt class="py-op">{</tt> </tt>
 <a name="L386"></a><tt class="py-lineno">386</tt>  <tt class="py-line">          <tt class="py-string">'type'</tt><tt class="py-op">:</tt> <tt class="py-string">'string'</tt><tt class="py-op">,</tt> </tt>
 <a name="L387"></a><tt class="py-lineno">387</tt>  <tt class="py-line">          <tt class="py-string">'location'</tt><tt class="py-op">:</tt> <tt class="py-string">'query'</tt> </tt>
@@ -556,8 +556,8 @@
 oauth2client.client.MemoryCache.get
 oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-104', 'get', 'link-76');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'type'</tt><tt class="py-op">,</tt> <tt class="py-string">'string'</tt><tt class="py-op">)</tt> </tt>
 <a name="L439"></a><tt class="py-lineno">439</tt>  <tt class="py-line"> </tt>
-<a name="L440"></a><tt class="py-lineno">440</tt>  <tt class="py-line">    <tt class="py-keyword">for</tt> <tt class="py-name">match</tt> <tt class="py-keyword">in</tt> <tt id="link-105" class="py-name"><a title="apiclient.discovery.URITEMPLATE" class="py-name" href="#" onclick="return doclink('link-105', 'URITEMPLATE', 'link-45');">URITEMPLATE</a></tt><tt class="py-op">.</tt><tt class="py-name">finditer</tt><tt class="py-op">(</tt><tt class="py-name">pathUrl</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-<a name="L441"></a><tt class="py-lineno">441</tt>  <tt class="py-line">      <tt class="py-keyword">for</tt> <tt class="py-name">namematch</tt> <tt class="py-keyword">in</tt> <tt id="link-106" class="py-name"><a title="apiclient.discovery.VARNAME" class="py-name" href="#" onclick="return doclink('link-106', 'VARNAME', 'link-46');">VARNAME</a></tt><tt class="py-op">.</tt><tt class="py-name">finditer</tt><tt class="py-op">(</tt><tt class="py-name">match</tt><tt class="py-op">.</tt><tt class="py-name">group</tt><tt class="py-op">(</tt><tt class="py-number">0</tt><tt class="py-op">)</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
+<a name="L440"></a><tt class="py-lineno">440</tt>  <tt class="py-line">    <tt class="py-keyword">for</tt> <tt class="py-name">match</tt> <tt class="py-keyword">in</tt> <tt id="link-105" class="py-name"><a title="apiclient.discovery.URITEMPLATE" class="py-name" href="#" onclick="return doclink('link-105', 'URITEMPLATE', 'link-46');">URITEMPLATE</a></tt><tt class="py-op">.</tt><tt class="py-name">finditer</tt><tt class="py-op">(</tt><tt class="py-name">pathUrl</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
+<a name="L441"></a><tt class="py-lineno">441</tt>  <tt class="py-line">      <tt class="py-keyword">for</tt> <tt class="py-name">namematch</tt> <tt class="py-keyword">in</tt> <tt id="link-106" class="py-name"><a title="apiclient.discovery.VARNAME" class="py-name" href="#" onclick="return doclink('link-106', 'VARNAME', 'link-47');">VARNAME</a></tt><tt class="py-op">.</tt><tt class="py-name">finditer</tt><tt class="py-op">(</tt><tt class="py-name">match</tt><tt class="py-op">.</tt><tt class="py-name">group</tt><tt class="py-op">(</tt><tt class="py-number">0</tt><tt class="py-op">)</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 <a name="L442"></a><tt class="py-lineno">442</tt>  <tt class="py-line">        <tt class="py-name">name</tt> <tt class="py-op">=</tt> <tt id="link-107" class="py-name"><a title="apiclient.discovery.key2param" class="py-name" href="#" onclick="return doclink('link-107', 'key2param', 'link-96');">key2param</a></tt><tt class="py-op">(</tt><tt class="py-name">namematch</tt><tt class="py-op">.</tt><tt class="py-name">group</tt><tt class="py-op">(</tt><tt class="py-number">0</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L443"></a><tt class="py-lineno">443</tt>  <tt class="py-line">        <tt class="py-name">path_params</tt><tt class="py-op">[</tt><tt class="py-name">name</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt class="py-name">name</tt> </tt>
 <a name="L444"></a><tt class="py-lineno">444</tt>  <tt class="py-line">        <tt class="py-keyword">if</tt> <tt class="py-name">name</tt> <tt class="py-keyword">in</tt> <tt id="link-108" class="py-name"><a title="oauth2client.tools.ClientRedirectServer.query_params" class="py-name" href="#" onclick="return doclink('link-108', 'query_params', 'link-95');">query_params</a></tt><tt class="py-op">:</tt> </tt>
@@ -736,7 +736,7 @@
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-145', 'logger', 'link-44');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">'URL being requested: %s'</tt> <tt class="py-op">%</tt> <tt class="py-name">url</tt><tt class="py-op">)</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-145', 'logger', 'link-45');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">'URL being requested: %s'</tt> <tt class="py-op">%</tt> <tt class="py-name">url</tt><tt class="py-op">)</tt> </tt>
 <a name="L589"></a><tt class="py-lineno">589</tt>  <tt class="py-line">      <tt class="py-keyword">return</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_requestBuilder</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_http</tt><tt class="py-op">,</tt> </tt>
 <a name="L590"></a><tt class="py-lineno">590</tt>  <tt class="py-line">                                  <tt id="link-146" class="py-name"><a title="apiclient.model" class="py-name" href="#" onclick="return doclink('link-146', 'model', 'link-29');">model</a></tt><tt class="py-op">.</tt><tt id="link-147" class="py-name" targets="Method apiclient.model.BaseModel.response()=apiclient.model.BaseModel-class.html#response,Method apiclient.model.Model.response()=apiclient.model.Model-class.html#response"><a title="apiclient.model.BaseModel.response
 apiclient.model.Model.response" class="py-name" href="#" onclick="return doclink('link-147', 'response', 'link-147');">response</a></tt><tt class="py-op">,</tt> </tt>
@@ -751,7 +751,7 @@
 </div><a name="L597"></a><tt class="py-lineno">597</tt>  <tt class="py-line"> </tt>
 <a name="L598"></a><tt class="py-lineno">598</tt>  <tt class="py-line">    <tt class="py-name">docs</tt> <tt class="py-op">=</tt> <tt class="py-op">[</tt><tt class="py-name">methodDesc</tt><tt class="py-op">.</tt><tt id="link-150" class="py-name"><a title="apiclient.schema.Schemas.get
 oauth2client.client.MemoryCache.get
-oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-150', 'get', 'link-76');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'description'</tt><tt class="py-op">,</tt> <tt id="link-151" class="py-name"><a title="apiclient.discovery.DEFAULT_METHOD_DOC" class="py-name" href="#" onclick="return doclink('link-151', 'DEFAULT_METHOD_DOC', 'link-48');">DEFAULT_METHOD_DOC</a></tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-string">'\n\n'</tt><tt class="py-op">]</tt> </tt>
+oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-150', 'get', 'link-76');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'description'</tt><tt class="py-op">,</tt> <tt id="link-151" class="py-name"><a title="apiclient.discovery.DEFAULT_METHOD_DOC" class="py-name" href="#" onclick="return doclink('link-151', 'DEFAULT_METHOD_DOC', 'link-49');">DEFAULT_METHOD_DOC</a></tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-string">'\n\n'</tt><tt class="py-op">]</tt> </tt>
 <a name="L599"></a><tt class="py-lineno">599</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">len</tt><tt class="py-op">(</tt><tt class="py-name">argmap</tt><tt class="py-op">)</tt> <tt class="py-op">&gt;</tt> <tt class="py-number">0</tt><tt class="py-op">:</tt> </tt>
 <a name="L600"></a><tt class="py-lineno">600</tt>  <tt class="py-line">      <tt class="py-name">docs</tt><tt class="py-op">.</tt><tt class="py-name">append</tt><tt class="py-op">(</tt><tt class="py-string">'Args:\n'</tt><tt class="py-op">)</tt> </tt>
 <a name="L601"></a><tt class="py-lineno">601</tt>  <tt class="py-line"> </tt>
@@ -759,7 +759,7 @@
 <a name="L603"></a><tt class="py-lineno">603</tt>  <tt class="py-line">    <tt class="py-name">skip_parameters</tt> <tt class="py-op">=</tt> <tt class="py-name">rootDesc</tt><tt class="py-op">.</tt><tt id="link-152" class="py-name"><a title="apiclient.schema.Schemas.get
 oauth2client.client.MemoryCache.get
 oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-152', 'get', 'link-76');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'parameters'</tt><tt class="py-op">,</tt> <tt class="py-op">{</tt><tt class="py-op">}</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt class="py-name">keys</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
-<a name="L604"></a><tt class="py-lineno">604</tt>  <tt class="py-line">    <tt class="py-name">skip_parameters</tt><tt class="py-op">.</tt><tt class="py-name">extend</tt><tt class="py-op">(</tt><tt id="link-153" class="py-name"><a title="apiclient.discovery.STACK_QUERY_PARAMETERS" class="py-name" href="#" onclick="return doclink('link-153', 'STACK_QUERY_PARAMETERS', 'link-49');">STACK_QUERY_PARAMETERS</a></tt><tt class="py-op">)</tt> </tt>
+<a name="L604"></a><tt class="py-lineno">604</tt>  <tt class="py-line">    <tt class="py-name">skip_parameters</tt><tt class="py-op">.</tt><tt class="py-name">extend</tt><tt class="py-op">(</tt><tt id="link-153" class="py-name"><a title="apiclient.discovery.STACK_QUERY_PARAMETERS" class="py-name" href="#" onclick="return doclink('link-153', 'STACK_QUERY_PARAMETERS', 'link-50');">STACK_QUERY_PARAMETERS</a></tt><tt class="py-op">)</tt> </tt>
 <a name="L605"></a><tt class="py-lineno">605</tt>  <tt class="py-line"> </tt>
 <a name="L606"></a><tt class="py-lineno">606</tt>  <tt class="py-line">    <tt class="py-name">all_args</tt> <tt class="py-op">=</tt> <tt class="py-name">argmap</tt><tt class="py-op">.</tt><tt class="py-name">keys</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L607"></a><tt class="py-lineno">607</tt>  <tt class="py-line">    <tt class="py-name">args_ordered</tt> <tt class="py-op">=</tt> <tt class="py-op">[</tt><tt id="link-154" class="py-name"><a title="apiclient.discovery.key2param" class="py-name" href="#" onclick="return doclink('link-154', 'key2param', 'link-96');">key2param</a></tt><tt class="py-op">(</tt><tt class="py-name">s</tt><tt class="py-op">)</tt> <tt class="py-keyword">for</tt> <tt class="py-name">s</tt> <tt class="py-keyword">in</tt> <tt class="py-name">methodDesc</tt><tt class="py-op">.</tt><tt id="link-155" class="py-name"><a title="apiclient.schema.Schemas.get
@@ -881,7 +881,7 @@
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-168', 'logger', 'link-44');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">'URL being requested: %s'</tt> <tt class="py-op">%</tt> <tt class="py-name">uri</tt><tt class="py-op">)</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-168', 'logger', 'link-45');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">'URL being requested: %s'</tt> <tt class="py-op">%</tt> <tt class="py-name">uri</tt><tt class="py-op">)</tt> </tt>
 <a name="L701"></a><tt class="py-lineno">701</tt>  <tt class="py-line"> </tt>
 <a name="L702"></a><tt class="py-lineno">702</tt>  <tt class="py-line">      <tt class="py-keyword">return</tt> <tt id="link-169" class="py-name"><a title="apiclient.http.HttpMock.request
 apiclient.http.HttpMockSequence.request
@@ -982,7 +982,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors-module.html b/docs/epy/apiclient.errors-module.html
index 93f926f..907c3b6 100644
--- a/docs/epy/apiclient.errors-module.html
+++ b/docs/epy/apiclient.errors-module.html
@@ -179,31 +179,6 @@
     </td>
   </tr>
 </table>
-<!-- ==================== VARIABLES ==================== -->
-<a name="section-Variables"></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">Variables</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Variables"
-         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">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'apiclient'"><code class="variable-quote">'</code><code class="variable-string">apiclient</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
-</table>
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -227,7 +202,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors-pysrc.html b/docs/epy/apiclient.errors-pysrc.html
index f8f0301..d1ef065 100644
--- a/docs/epy/apiclient.errors-pysrc.html
+++ b/docs/epy/apiclient.errors-pysrc.html
@@ -299,7 +299,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.BatchError-class.html b/docs/epy/apiclient.errors.BatchError-class.html
index ce258c2..caa013b 100644
--- a/docs/epy/apiclient.errors.BatchError-class.html
+++ b/docs/epy/apiclient.errors.BatchError-class.html
@@ -56,11 +56,11 @@
 <h1 class="epydoc">Class BatchError</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.errors-pysrc.html#BatchError">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_batcherror" name="class_hierarchy_for_batcherror">
-<area shape="rect" href="apiclient.errors.BatchError-class.html" title="BatchError" alt="" coords="52,229,135,256"/>
-<area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="apiclient.errors.HttpError-class.html" title="HttpError" alt="" coords="57,173,129,200"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
+<area shape="rect" href="apiclient.errors.BatchError-class.html" title="BatchError" alt="" coords="5,5,88,32"/>
+<area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="176,117,224,144"/>
+<area shape="rect" href="apiclient.errors.HttpError-class.html" title="HttpError" alt="" coords="312,5,384,32"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="112,5,288,32"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="127,61,273,88"/>
 </map>
   <img src="class_hierarchy_for_batcherror.gif" alt='' usemap="#class_hierarchy_for_batcherror" ismap="ismap" class="graph-without-title" />
 </center>
@@ -94,11 +94,13 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.errors.BatchError-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 />
+          <td><span class="summary-sig"><a href="apiclient.errors.BatchError-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">reason</span>,
+        <span class="summary-sig-arg">resp</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">content</span>=<span class="summary-sig-default">None</span>)</span><br />
       x.__init__(...) initializes x; see x.__class__.__doc__ for signature</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.errors-pysrc.html#BatchError.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -222,12 +224,14 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">reason</span>,
+        <span class="sig-arg">resp</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">content</span>=<span class="sig-default">None</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.errors-pysrc.html#BatchError.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -325,7 +329,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.Error-class.html b/docs/epy/apiclient.errors.Error-class.html
index 640e18e..ed506cd 100644
--- a/docs/epy/apiclient.errors.Error-class.html
+++ b/docs/epy/apiclient.errors.Error-class.html
@@ -56,20 +56,9 @@
 <h1 class="epydoc">Class Error</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.errors-pysrc.html#Error">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_error" name="class_hierarchy_for_error">
-<area shape="rect" href="apiclient.errors.BatchError-class.html" title="BatchError" alt="" coords="5,229,88,256"/>
-<area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="737,117,785,144"/>
-<area shape="rect" href="apiclient.errors.HttpError-class.html" title="HttpError" alt="" coords="11,173,83,200"/>
-<area shape="rect" href="apiclient.errors.InvalidChunkSizeError-class.html" title="InvalidChunkSizeError" alt="" coords="107,173,253,200"/>
-<area shape="rect" href="apiclient.errors.InvalidJsonError-class.html" title="InvalidJsonError" alt="" coords="277,173,389,200"/>
-<area shape="rect" href="apiclient.errors.MediaUploadSizeError-class.html" title="MediaUploadSizeError" alt="" coords="413,173,563,200"/>
-<area shape="rect" href="apiclient.errors.ResumableUploadError-class.html" title="ResumableUploadError" alt="" coords="587,173,741,200"/>
-<area shape="rect" href="apiclient.errors.UnacceptableMimeTypeError-class.html" title="UnacceptableMimeTypeError" alt="" coords="765,173,952,200"/>
-<area shape="rect" href="apiclient.errors.UnexpectedBodyError-class.html" title="UnexpectedBodyError" alt="" coords="976,173,1123,200"/>
-<area shape="rect" href="apiclient.errors.UnexpectedMethodError-class.html" title="UnexpectedMethodError" alt="" coords="1147,173,1307,200"/>
-<area shape="rect" href="apiclient.errors.UnknownApiNameOrVersion-class.html" title="UnknownApiNameOrVersion" alt="" coords="1331,173,1515,200"/>
-<area shape="rect" href="apiclient.errors.UnknownLinkType-class.html" title="UnknownLinkType" alt="" coords="1539,173,1664,200"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="673,5,849,32"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="688,61,835,88"/>
+<area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
   <img src="class_hierarchy_for_error.gif" alt='' usemap="#class_hierarchy_for_error" ismap="ismap" class="graph-without-title" />
 </center>
@@ -177,7 +166,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.HttpError-class.html b/docs/epy/apiclient.errors.HttpError-class.html
index cb61d09..c3099a4 100644
--- a/docs/epy/apiclient.errors.HttpError-class.html
+++ b/docs/epy/apiclient.errors.HttpError-class.html
@@ -56,9 +56,8 @@
 <h1 class="epydoc">Class HttpError</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.errors-pysrc.html#HttpError">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_httperror" name="class_hierarchy_for_httperror">
-<area shape="rect" href="apiclient.errors.BatchError-class.html" title="BatchError" alt="" coords="52,229,135,256"/>
 <area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="apiclient.errors.HttpError-class.html" title="HttpError" alt="" coords="57,173,129,200"/>
+<area shape="rect" href="apiclient.errors.HttpError-class.html" title="HttpError" alt="" coords="205,5,277,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
@@ -94,11 +93,13 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.errors.HttpError-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 />
+          <td><span class="summary-sig"><a href="apiclient.errors.HttpError-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">resp</span>,
+        <span class="summary-sig-arg">content</span>,
+        <span class="summary-sig-arg">uri</span>=<span class="summary-sig-default">None</span>)</span><br />
       x.__init__(...) initializes x; see x.__class__.__doc__ for signature</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.errors-pysrc.html#HttpError.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -236,12 +237,14 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">resp</span>,
+        <span class="sig-arg">content</span>,
+        <span class="sig-arg">uri</span>=<span class="sig-default">None</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.errors-pysrc.html#HttpError.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -339,7 +342,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.InvalidChunkSizeError-class.html b/docs/epy/apiclient.errors.InvalidChunkSizeError-class.html
index 0e57c91..36d06be 100644
--- a/docs/epy/apiclient.errors.InvalidChunkSizeError-class.html
+++ b/docs/epy/apiclient.errors.InvalidChunkSizeError-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_invalidchu" name="class_hierarchy_for_invalidchu">
 <area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="apiclient.errors.InvalidChunkSizeError-class.html" title="InvalidChunkSizeError" alt="" coords="20,173,167,200"/>
+<area shape="rect" href="apiclient.errors.InvalidChunkSizeError-class.html" title="InvalidChunkSizeError" alt="" coords="205,5,352,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.InvalidJsonError-class.html b/docs/epy/apiclient.errors.InvalidJsonError-class.html
index ef446fa..23d1ed0 100644
--- a/docs/epy/apiclient.errors.InvalidJsonError-class.html
+++ b/docs/epy/apiclient.errors.InvalidJsonError-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_invalidjso" name="class_hierarchy_for_invalidjso">
 <area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="apiclient.errors.InvalidJsonError-class.html" title="InvalidJsonError" alt="" coords="37,173,149,200"/>
+<area shape="rect" href="apiclient.errors.InvalidJsonError-class.html" title="InvalidJsonError" alt="" coords="205,5,317,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.MediaUploadSizeError-class.html b/docs/epy/apiclient.errors.MediaUploadSizeError-class.html
index 2775e52..94e5229 100644
--- a/docs/epy/apiclient.errors.MediaUploadSizeError-class.html
+++ b/docs/epy/apiclient.errors.MediaUploadSizeError-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_mediauploa" name="class_hierarchy_for_mediauploa">
 <area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="apiclient.errors.MediaUploadSizeError-class.html" title="MediaUploadSizeError" alt="" coords="19,173,168,200"/>
+<area shape="rect" href="apiclient.errors.MediaUploadSizeError-class.html" title="MediaUploadSizeError" alt="" coords="205,5,355,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.ResumableUploadError-class.html b/docs/epy/apiclient.errors.ResumableUploadError-class.html
index 330e301..a56503c 100644
--- a/docs/epy/apiclient.errors.ResumableUploadError-class.html
+++ b/docs/epy/apiclient.errors.ResumableUploadError-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_resumableu" name="class_hierarchy_for_resumableu">
 <area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="apiclient.errors.ResumableUploadError-class.html" title="ResumableUploadError" alt="" coords="16,173,171,200"/>
+<area shape="rect" href="apiclient.errors.ResumableUploadError-class.html" title="ResumableUploadError" alt="" coords="205,5,360,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.UnacceptableMimeTypeError-class.html b/docs/epy/apiclient.errors.UnacceptableMimeTypeError-class.html
index 23405f6..b7bc0be 100644
--- a/docs/epy/apiclient.errors.UnacceptableMimeTypeError-class.html
+++ b/docs/epy/apiclient.errors.UnacceptableMimeTypeError-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class UnacceptableMimeTypeError</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.errors-pysrc.html#UnacceptableMimeTypeError">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_unacceptab" name="class_hierarchy_for_unacceptab">
-<area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="75,117,123,144"/>
-<area shape="rect" href="apiclient.errors.UnacceptableMimeTypeError-class.html" title="UnacceptableMimeTypeError" alt="" coords="5,173,192,200"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="11,5,187,32"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="25,61,172,88"/>
+<area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
+<area shape="rect" href="apiclient.errors.UnacceptableMimeTypeError-class.html" title="UnacceptableMimeTypeError" alt="" coords="205,5,392,32"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
   <img src="class_hierarchy_for_unacceptab.gif" alt='' usemap="#class_hierarchy_for_unacceptab" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.UnexpectedBodyError-class.html b/docs/epy/apiclient.errors.UnexpectedBodyError-class.html
index a5aa12a..cbfd9ba 100644
--- a/docs/epy/apiclient.errors.UnexpectedBodyError-class.html
+++ b/docs/epy/apiclient.errors.UnexpectedBodyError-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_unexpected" name="class_hierarchy_for_unexpected">
 <area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="apiclient.errors.UnexpectedBodyError-class.html" title="UnexpectedBodyError" alt="" coords="20,173,167,200"/>
+<area shape="rect" href="apiclient.errors.UnexpectedBodyError-class.html" title="UnexpectedBodyError" alt="" coords="205,5,352,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
@@ -232,7 +232,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.UnexpectedMethodError-class.html b/docs/epy/apiclient.errors.UnexpectedMethodError-class.html
index 50fe37e..2fbacc2 100644
--- a/docs/epy/apiclient.errors.UnexpectedMethodError-class.html
+++ b/docs/epy/apiclient.errors.UnexpectedMethodError-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_unexpected_2" name="class_hierarchy_for_unexpected_2">
 <area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="apiclient.errors.UnexpectedMethodError-class.html" title="UnexpectedMethodError" alt="" coords="13,173,173,200"/>
+<area shape="rect" href="apiclient.errors.UnexpectedMethodError-class.html" title="UnexpectedMethodError" alt="" coords="205,5,365,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
@@ -93,11 +93,11 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.errors.UnexpectedMethodError-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 />
+          <td><span class="summary-sig"><a href="apiclient.errors.UnexpectedMethodError-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">methodId</span>=<span class="summary-sig-default">None</span>)</span><br />
       Constructor for an UnexpectedMethodError.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.errors-pysrc.html#UnexpectedMethodError.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -186,12 +186,12 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">methodId</span>=<span class="sig-default">None</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.errors-pysrc.html#UnexpectedMethodError.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -234,7 +234,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.UnknownApiNameOrVersion-class.html b/docs/epy/apiclient.errors.UnknownApiNameOrVersion-class.html
index 6b50c3f..99594ed 100644
--- a/docs/epy/apiclient.errors.UnknownApiNameOrVersion-class.html
+++ b/docs/epy/apiclient.errors.UnknownApiNameOrVersion-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class UnknownApiNameOrVersion</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.errors-pysrc.html#UnknownApiNameOrVersion">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_unknownapi" name="class_hierarchy_for_unknownapi">
-<area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="73,117,121,144"/>
-<area shape="rect" href="apiclient.errors.UnknownApiNameOrVersion-class.html" title="UnknownApiNameOrVersion" alt="" coords="5,173,189,200"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="9,5,185,32"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="24,61,171,88"/>
+<area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
+<area shape="rect" href="apiclient.errors.UnknownApiNameOrVersion-class.html" title="UnknownApiNameOrVersion" alt="" coords="205,5,389,32"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
   <img src="class_hierarchy_for_unknownapi.gif" alt='' usemap="#class_hierarchy_for_unknownapi" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.errors.UnknownLinkType-class.html b/docs/epy/apiclient.errors.UnknownLinkType-class.html
index f540169..84b6ff5 100644
--- a/docs/epy/apiclient.errors.UnknownLinkType-class.html
+++ b/docs/epy/apiclient.errors.UnknownLinkType-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_unknownlin" name="class_hierarchy_for_unknownlin">
 <area shape="rect" href="apiclient.errors.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="apiclient.errors.UnknownLinkType-class.html" title="UnknownLinkType" alt="" coords="31,173,156,200"/>
+<area shape="rect" href="apiclient.errors.UnknownLinkType-class.html" title="UnknownLinkType" alt="" coords="205,5,331,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 </map>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.ext-module.html b/docs/epy/apiclient.ext-module.html
index 8481e17..75bf2f0 100644
--- a/docs/epy/apiclient.ext-module.html
+++ b/docs/epy/apiclient.ext-module.html
@@ -53,31 +53,6 @@
 </table>
 <!-- ==================== PACKAGE DESCRIPTION ==================== -->
 <h1 class="epydoc">Package ext</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.ext-pysrc.html">source&nbsp;code</a></span></p>
-<!-- ==================== VARIABLES ==================== -->
-<a name="section-Variables"></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">Variables</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Variables"
-         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">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="None">None</code>
-    </td>
-  </tr>
-</table>
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -101,7 +76,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.ext-pysrc.html b/docs/epy/apiclient.ext-pysrc.html
index 13fc97d..40b61b8 100644
--- a/docs/epy/apiclient.ext-pysrc.html
+++ b/docs/epy/apiclient.ext-pysrc.html
@@ -84,7 +84,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http-module.html b/docs/epy/apiclient.http-module.html
index a08bed5..a1ffcc7 100644
--- a/docs/epy/apiclient.http-module.html
+++ b/docs/epy/apiclient.http-module.html
@@ -270,7 +270,7 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="DEFAULT_CHUNK_SIZE"></a><span class="summary-name">DEFAULT_CHUNK_SIZE</span> = <code title="524288">524288</code>
+        <a name="DEFAULT_CHUNK_SIZE"></a><span class="summary-name">DEFAULT_CHUNK_SIZE</span> = <code title="512* 1024">512* 1024</code>
     </td>
   </tr>
 <tr>
@@ -280,13 +280,6 @@
         <a name="MAX_URI_LENGTH"></a><span class="summary-name">MAX_URI_LENGTH</span> = <code title="4000">4000</code>
     </td>
   </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'apiclient'"><code class="variable-quote">'</code><code class="variable-string">apiclient</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
 </table>
 <!-- ==================== FUNCTION DETAILS ==================== -->
 <a name="section-FunctionDetails"></a>
@@ -406,7 +399,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http-pysrc.html b/docs/epy/apiclient.http-pysrc.html
index 335ccc2..57e679d 100644
--- a/docs/epy/apiclient.http-pysrc.html
+++ b/docs/epy/apiclient.http-pysrc.html
@@ -2024,7 +2024,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.BatchHttpRequest-class.html b/docs/epy/apiclient.http.BatchHttpRequest-class.html
index 27153b6..f063358 100644
--- a/docs/epy/apiclient.http.BatchHttpRequest-class.html
+++ b/docs/epy/apiclient.http.BatchHttpRequest-class.html
@@ -119,11 +119,12 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.BatchHttpRequest-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 />
+          <td><span class="summary-sig"><a href="apiclient.http.BatchHttpRequest-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">callback</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">batch_uri</span>=<span class="summary-sig-default">None</span>)</span><br />
       Constructor for a BatchHttpRequest.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#BatchHttpRequest.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -245,11 +246,13 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.BatchHttpRequest-class.html#add" class="summary-sig-name">add</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="apiclient.http.BatchHttpRequest-class.html#add" class="summary-sig-name">add</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">request</span>,
+        <span class="summary-sig-arg">callback</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">request_id</span>=<span class="summary-sig-default">None</span>)</span><br />
       Add a new request.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#BatchHttpRequest.add">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -283,11 +286,11 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.BatchHttpRequest-class.html#execute" class="summary-sig-name">execute</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="apiclient.http.BatchHttpRequest-class.html#execute" class="summary-sig-name">execute</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">http</span>=<span class="summary-sig-default">None</span>)</span><br />
       Execute all the requests as a single batched HTTP request.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#BatchHttpRequest.execute">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -364,12 +367,13 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">callback</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">batch_uri</span>=<span class="sig-default">None</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#BatchHttpRequest.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -582,11 +586,13 @@
 <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">add</span>(<span class="sig-arg">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">add</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">request</span>,
+        <span class="sig-arg">callback</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">request_id</span>=<span class="sig-default">None</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#BatchHttpRequest.add">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -669,11 +675,11 @@
 <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">execute</span>(<span class="sig-arg">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">execute</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">http</span>=<span class="sig-default">None</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#BatchHttpRequest.execute">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -725,7 +731,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.HttpMock-class.html b/docs/epy/apiclient.http.HttpMock-class.html
index 6daa8ca..c3cbf41 100644
--- a/docs/epy/apiclient.http.HttpMock-class.html
+++ b/docs/epy/apiclient.http.HttpMock-class.html
@@ -111,7 +111,7 @@
         <tr>
           <td><span class="summary-sig"><a name="request"></a><span class="summary-sig-name">request</span>(<span class="summary-sig-arg">self</span>,
         <span class="summary-sig-arg">uri</span>,
-        <span class="summary-sig-arg">method</span>=<span class="summary-sig-default"><code class="variable-quote">'</code><code class="variable-string">GET</code><code class="variable-quote">'</code></span>,
+        <span class="summary-sig-arg">method</span>=<span class="summary-sig-default">'GET'</span>,
         <span class="summary-sig-arg">body</span>=<span class="summary-sig-default">None</span>,
         <span class="summary-sig-arg">headers</span>=<span class="summary-sig-default">None</span>,
         <span class="summary-sig-arg">redirections</span>=<span class="summary-sig-default">1</span>,
@@ -242,7 +242,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.HttpMockSequence-class.html b/docs/epy/apiclient.http.HttpMockSequence-class.html
index 2ffb032..a838a37 100644
--- a/docs/epy/apiclient.http.HttpMockSequence-class.html
+++ b/docs/epy/apiclient.http.HttpMockSequence-class.html
@@ -130,7 +130,7 @@
         <tr>
           <td><span class="summary-sig"><a name="request"></a><span class="summary-sig-name">request</span>(<span class="summary-sig-arg">self</span>,
         <span class="summary-sig-arg">uri</span>,
-        <span class="summary-sig-arg">method</span>=<span class="summary-sig-default"><code class="variable-quote">'</code><code class="variable-string">GET</code><code class="variable-quote">'</code></span>,
+        <span class="summary-sig-arg">method</span>=<span class="summary-sig-default">'GET'</span>,
         <span class="summary-sig-arg">body</span>=<span class="summary-sig-default">None</span>,
         <span class="summary-sig-arg">headers</span>=<span class="summary-sig-default">None</span>,
         <span class="summary-sig-arg">redirections</span>=<span class="summary-sig-default">1</span>,
@@ -259,7 +259,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.HttpRequest-class.html b/docs/epy/apiclient.http.HttpRequest-class.html
index 944b138..056a21a 100644
--- a/docs/epy/apiclient.http.HttpRequest-class.html
+++ b/docs/epy/apiclient.http.HttpRequest-class.html
@@ -90,11 +90,18 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.HttpRequest-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 />
+          <td><span class="summary-sig"><a href="apiclient.http.HttpRequest-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">http</span>,
+        <span class="summary-sig-arg">postproc</span>,
+        <span class="summary-sig-arg">uri</span>,
+        <span class="summary-sig-arg">method</span>=<span class="summary-sig-default">'GET'</span>,
+        <span class="summary-sig-arg">body</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">headers</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">methodId</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">resumable</span>=<span class="summary-sig-default">None</span>)</span><br />
       Constructor for an HttpRequest.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#HttpRequest.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -108,11 +115,11 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.HttpRequest-class.html#execute" class="summary-sig-name">execute</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="apiclient.http.HttpRequest-class.html#execute" class="summary-sig-name">execute</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">http</span>=<span class="summary-sig-default">None</span>)</span><br />
       Execute the request.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#HttpRequest.execute">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -126,11 +133,11 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.HttpRequest-class.html#next_chunk" class="summary-sig-name">next_chunk</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="apiclient.http.HttpRequest-class.html#next_chunk" class="summary-sig-name">next_chunk</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">http</span>=<span class="summary-sig-default">None</span>)</span><br />
       Execute the next step of a resumable upload.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#HttpRequest.next_chunk">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -280,12 +287,19 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">http</span>,
+        <span class="sig-arg">postproc</span>,
+        <span class="sig-arg">uri</span>,
+        <span class="sig-arg">method</span>=<span class="sig-default">'GET'</span>,
+        <span class="sig-arg">body</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">headers</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">methodId</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">resumable</span>=<span class="sig-default">None</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#HttpRequest.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -323,11 +337,11 @@
 <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">execute</span>(<span class="sig-arg">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">execute</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">http</span>=<span class="sig-default">None</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#HttpRequest.execute">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -362,11 +376,11 @@
 <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">next_chunk</span>(<span class="sig-arg">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">next_chunk</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">http</span>=<span class="sig-default">None</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#HttpRequest.next_chunk">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -468,7 +482,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.HttpRequestMock-class.html b/docs/epy/apiclient.http.HttpRequestMock-class.html
index 88195b0..0ce578f 100644
--- a/docs/epy/apiclient.http.HttpRequestMock-class.html
+++ b/docs/epy/apiclient.http.HttpRequestMock-class.html
@@ -271,7 +271,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.MediaDownloadProgress-class.html b/docs/epy/apiclient.http.MediaDownloadProgress-class.html
index a2f5f79..3d097df 100644
--- a/docs/epy/apiclient.http.MediaDownloadProgress-class.html
+++ b/docs/epy/apiclient.http.MediaDownloadProgress-class.html
@@ -264,7 +264,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.MediaFileUpload-class.html b/docs/epy/apiclient.http.MediaFileUpload-class.html
index a271558..ed10080 100644
--- a/docs/epy/apiclient.http.MediaFileUpload-class.html
+++ b/docs/epy/apiclient.http.MediaFileUpload-class.html
@@ -56,9 +56,9 @@
 <h1 class="epydoc">Class MediaFileUpload</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.http-pysrc.html#MediaFileUpload">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_mediafileu" name="class_hierarchy_for_mediafileu">
-<area shape="rect" href="apiclient.http.MediaFileUpload-class.html" title="MediaFileUpload" alt="" coords="15,117,132,144"/>
-<area shape="rect" href="apiclient.http.MediaIoBaseUpload-class.html" title="MediaIoBaseUpload" alt="" coords="5,61,141,88"/>
-<area shape="rect" href="apiclient.http.MediaUpload-class.html" title="MediaUpload" alt="" coords="25,5,121,32"/>
+<area shape="rect" href="apiclient.http.MediaFileUpload-class.html" title="MediaFileUpload" alt="" coords="5,5,123,32"/>
+<area shape="rect" href="apiclient.http.MediaIoBaseUpload-class.html" title="MediaIoBaseUpload" alt="" coords="147,5,283,32"/>
+<area shape="rect" href="apiclient.http.MediaUpload-class.html" title="MediaUpload" alt="" coords="307,5,403,32"/>
 </map>
   <img src="class_hierarchy_for_mediafileu.gif" alt='' usemap="#class_hierarchy_for_mediafileu" ismap="ismap" class="graph-without-title" />
 </center>
@@ -111,11 +111,14 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaFileUpload-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 />
+          <td><span class="summary-sig"><a href="apiclient.http.MediaFileUpload-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">filename</span>,
+        <span class="summary-sig-arg">mimetype</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">chunksize</span>=<span class="summary-sig-default">DEFAULT_CHUNK_SIZE</span>,
+        <span class="summary-sig-arg">resumable</span>=<span class="summary-sig-default">False</span>)</span><br />
       Constructor.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaFileUpload.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -280,12 +283,15 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">filename</span>,
+        <span class="sig-arg">mimetype</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">chunksize</span>=<span class="sig-default">DEFAULT_CHUNK_SIZE</span>,
+        <span class="sig-arg">resumable</span>=<span class="sig-default">False</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaFileUpload.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -369,7 +375,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.MediaInMemoryUpload-class.html b/docs/epy/apiclient.http.MediaInMemoryUpload-class.html
index 2cacacc..37d05e0 100644
--- a/docs/epy/apiclient.http.MediaInMemoryUpload-class.html
+++ b/docs/epy/apiclient.http.MediaInMemoryUpload-class.html
@@ -56,9 +56,9 @@
 <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,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"/>
+<area shape="rect" href="apiclient.http.MediaInMemoryUpload-class.html" title="MediaInMemoryUpload" alt="" coords="5,5,157,32"/>
+<area shape="rect" href="apiclient.http.MediaIoBaseUpload-class.html" title="MediaIoBaseUpload" alt="" coords="181,5,317,32"/>
+<area shape="rect" href="apiclient.http.MediaUpload-class.html" title="MediaUpload" alt="" coords="341,5,437,32"/>
 </map>
   <img src="class_hierarchy_for_mediainmem.gif" alt='' usemap="#class_hierarchy_for_mediainmem" ismap="ismap" class="graph-without-title" />
 </center>
@@ -95,11 +95,14 @@
     </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">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <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">'application/octet-stream'</span>,
+        <span class="summary-sig-arg">chunksize</span>=<span class="summary-sig-default">DEFAULT_CHUNK_SIZE</span>,
+        <span class="summary-sig-arg">resumable</span>=<span class="summary-sig-default">False</span>)</span><br />
       Create a new MediaInMemoryUpload.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -214,12 +217,15 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <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">'application/octet-stream'</span>,
+        <span class="sig-arg">chunksize</span>=<span class="sig-default">DEFAULT_CHUNK_SIZE</span>,
+        <span class="sig-arg">resumable</span>=<span class="sig-default">False</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaInMemoryUpload.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -275,7 +281,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.MediaIoBaseDownload-class.html b/docs/epy/apiclient.http.MediaIoBaseDownload-class.html
index 93b1dda..21c9ae0 100644
--- a/docs/epy/apiclient.http.MediaIoBaseDownload-class.html
+++ b/docs/epy/apiclient.http.MediaIoBaseDownload-class.html
@@ -106,11 +106,13 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaIoBaseDownload-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 />
+          <td><span class="summary-sig"><a href="apiclient.http.MediaIoBaseDownload-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">fd</span>,
+        <span class="summary-sig-arg">request</span>,
+        <span class="summary-sig-arg">chunksize</span>=<span class="summary-sig-default">DEFAULT_CHUNK_SIZE</span>)</span><br />
       Constructor.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaIoBaseDownload.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -204,12 +206,14 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">fd</span>,
+        <span class="sig-arg">request</span>,
+        <span class="sig-arg">chunksize</span>=<span class="sig-default">DEFAULT_CHUNK_SIZE</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaIoBaseDownload.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -290,7 +294,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.MediaIoBaseUpload-class.html b/docs/epy/apiclient.http.MediaIoBaseUpload-class.html
index c2f8d23..162f466 100644
--- a/docs/epy/apiclient.http.MediaIoBaseUpload-class.html
+++ b/docs/epy/apiclient.http.MediaIoBaseUpload-class.html
@@ -56,10 +56,8 @@
 <h1 class="epydoc">Class MediaIoBaseUpload</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.http-pysrc.html#MediaIoBaseUpload">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_mediaiobas_2" name="class_hierarchy_for_mediaiobas_2">
-<area shape="rect" href="apiclient.http.MediaFileUpload-class.html" title="MediaFileUpload" alt="" coords="5,117,123,144"/>
-<area shape="rect" href="apiclient.http.MediaInMemoryUpload-class.html" title="MediaInMemoryUpload" alt="" coords="147,117,299,144"/>
-<area shape="rect" href="apiclient.http.MediaIoBaseUpload-class.html" title="MediaIoBaseUpload" alt="" coords="75,61,211,88"/>
-<area shape="rect" href="apiclient.http.MediaUpload-class.html" title="MediaUpload" alt="" coords="95,5,191,32"/>
+<area shape="rect" href="apiclient.http.MediaIoBaseUpload-class.html" title="MediaIoBaseUpload" alt="" coords="5,5,141,32"/>
+<area shape="rect" href="apiclient.http.MediaUpload-class.html" title="MediaUpload" alt="" coords="165,5,261,32"/>
 </map>
   <img src="class_hierarchy_for_mediaiobas_2.gif" alt='' usemap="#class_hierarchy_for_mediaiobas_2" ismap="ismap" class="graph-without-title" />
 </center>
@@ -112,11 +110,14 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaIoBaseUpload-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 />
+          <td><span class="summary-sig"><a href="apiclient.http.MediaIoBaseUpload-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">fd</span>,
+        <span class="summary-sig-arg">mimetype</span>,
+        <span class="summary-sig-arg">chunksize</span>=<span class="summary-sig-default">DEFAULT_CHUNK_SIZE</span>,
+        <span class="summary-sig-arg">resumable</span>=<span class="summary-sig-default">False</span>)</span><br />
       Constructor.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaIoBaseUpload.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -359,12 +360,15 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">fd</span>,
+        <span class="sig-arg">mimetype</span>,
+        <span class="sig-arg">chunksize</span>=<span class="sig-default">DEFAULT_CHUNK_SIZE</span>,
+        <span class="sig-arg">resumable</span>=<span class="sig-default">False</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaIoBaseUpload.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -654,7 +658,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.MediaUpload-class.html b/docs/epy/apiclient.http.MediaUpload-class.html
index c58fa09..4f390d5 100644
--- a/docs/epy/apiclient.http.MediaUpload-class.html
+++ b/docs/epy/apiclient.http.MediaUpload-class.html
@@ -56,10 +56,7 @@
 <h1 class="epydoc">Class MediaUpload</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.http-pysrc.html#MediaUpload">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_mediauploa_2" name="class_hierarchy_for_mediauploa_2">
-<area shape="rect" href="apiclient.http.MediaFileUpload-class.html" title="MediaFileUpload" alt="" coords="5,117,123,144"/>
-<area shape="rect" href="apiclient.http.MediaInMemoryUpload-class.html" title="MediaInMemoryUpload" alt="" coords="147,117,299,144"/>
-<area shape="rect" href="apiclient.http.MediaIoBaseUpload-class.html" title="MediaIoBaseUpload" alt="" coords="75,61,211,88"/>
-<area shape="rect" href="apiclient.http.MediaUpload-class.html" title="MediaUpload" alt="" coords="95,5,191,32"/>
+<area shape="rect" href="apiclient.http.MediaUpload-class.html" title="MediaUpload" alt="" coords="5,5,101,32"/>
 </map>
   <img src="class_hierarchy_for_mediauploa_2.gif" alt='' usemap="#class_hierarchy_for_mediauploa_2" ismap="ismap" class="graph-without-title" />
 </center>
@@ -237,11 +234,11 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.http.MediaUpload-class.html#_to_json" class="summary-sig-name" onclick="show_private();">_to_json</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="apiclient.http.MediaUpload-class.html#_to_json" class="summary-sig-name" onclick="show_private();">_to_json</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">strip</span>=<span class="summary-sig-default">None</span>)</span><br />
       Utility function for creating a JSON representation of a MediaUpload.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.http-pysrc.html#MediaUpload._to_json">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -560,11 +557,11 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">_to_json</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">strip</span>=<span class="sig-default">None</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.http-pysrc.html#MediaUpload._to_json">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -669,7 +666,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.MediaUploadProgress-class.html b/docs/epy/apiclient.http.MediaUploadProgress-class.html
index 5e962c8..4d8f6d3 100644
--- a/docs/epy/apiclient.http.MediaUploadProgress-class.html
+++ b/docs/epy/apiclient.http.MediaUploadProgress-class.html
@@ -265,7 +265,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:12 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http.RequestMockBuilder-class.html b/docs/epy/apiclient.http.RequestMockBuilder-class.html
index 370fca7..3059f70 100644
--- a/docs/epy/apiclient.http.RequestMockBuilder-class.html
+++ b/docs/epy/apiclient.http.RequestMockBuilder-class.html
@@ -136,7 +136,7 @@
         <span class="summary-sig-arg">http</span>,
         <span class="summary-sig-arg">postproc</span>,
         <span class="summary-sig-arg">uri</span>,
-        <span class="summary-sig-arg">method</span>=<span class="summary-sig-default"><code class="variable-quote">'</code><code class="variable-string">GET</code><code class="variable-quote">'</code></span>,
+        <span class="summary-sig-arg">method</span>=<span class="summary-sig-default">'GET'</span>,
         <span class="summary-sig-arg">body</span>=<span class="summary-sig-default">None</span>,
         <span class="summary-sig-arg">headers</span>=<span class="summary-sig-default">None</span>,
         <span class="summary-sig-arg">methodId</span>=<span class="summary-sig-default">None</span>,
@@ -264,7 +264,7 @@
         <span class="sig-arg">http</span>,
         <span class="sig-arg">postproc</span>,
         <span class="sig-arg">uri</span>,
-        <span class="sig-arg">method</span>=<span class="sig-default"><code class="variable-quote">'</code><code class="variable-string">GET</code><code class="variable-quote">'</code></span>,
+        <span class="sig-arg">method</span>=<span class="sig-default">'GET'</span>,
         <span class="sig-arg">body</span>=<span class="sig-default">None</span>,
         <span class="sig-arg">headers</span>=<span class="sig-default">None</span>,
         <span class="sig-arg">methodId</span>=<span class="sig-default">None</span>,
@@ -311,7 +311,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.http._StreamSlice-class.html b/docs/epy/apiclient.http._StreamSlice-class.html
index 2d0de95..121fe52 100644
--- a/docs/epy/apiclient.http._StreamSlice-class.html
+++ b/docs/epy/apiclient.http._StreamSlice-class.html
@@ -277,7 +277,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.mimeparse-module.html b/docs/epy/apiclient.mimeparse-module.html
index 409916c..a97b71c 100644
--- a/docs/epy/apiclient.mimeparse-module.html
+++ b/docs/epy/apiclient.mimeparse-module.html
@@ -246,21 +246,14 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="__email__"></a><span class="summary-name">__email__</span> = <code title="'joe@bitworking.org'"><code class="variable-quote">'</code><code class="variable-string">joe@bitworking.org</code><code class="variable-quote">'</code></code>
+        <a name="__email__"></a><span class="summary-name">__email__</span> = <code title="'joe@bitworking.org'">'joe@bitworking.org'</code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="__credits__"></a><span class="summary-name">__credits__</span> = <code title="''"><code class="variable-quote">'</code><code class="variable-string"></code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="None">None</code>
+        <a name="__credits__"></a><span class="summary-name">__credits__</span> = <code title="''">''</code>
     </td>
   </tr>
 </table>
@@ -491,7 +484,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.mimeparse-pysrc.html b/docs/epy/apiclient.mimeparse-pysrc.html
index 85b099c..327f592 100644
--- a/docs/epy/apiclient.mimeparse-pysrc.html
+++ b/docs/epy/apiclient.mimeparse-pysrc.html
@@ -255,7 +255,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.model-module.html b/docs/epy/apiclient.model-module.html
index 12e6a75..e58b703 100644
--- a/docs/epy/apiclient.model-module.html
+++ b/docs/epy/apiclient.model-module.html
@@ -209,13 +209,6 @@
         <a name="FLAGS"></a><span class="summary-name">FLAGS</span> = <code title="gflags.FLAGS">gflags.FLAGS</code>
     </td>
   </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'apiclient'"><code class="variable-quote">'</code><code class="variable-string">apiclient</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
 </table>
 <!-- ==================== FUNCTION DETAILS ==================== -->
 <a name="section-FunctionDetails"></a>
@@ -300,7 +293,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.model-pysrc.html b/docs/epy/apiclient.model-pysrc.html
index 5c1f352..c06b3b1 100644
--- a/docs/epy/apiclient.model-pysrc.html
+++ b/docs/epy/apiclient.model-pysrc.html
@@ -170,7 +170,7 @@
 apiclient.model.MediaModel.content_type
 apiclient.model.ProtocolBufferModel.content_type
 apiclient.model.RawModel.content_type" class="py-name" href="#" onclick="return doclink('link-9', 'content_type', 'link-9');">content_type</a></tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
-<a name="L104"></a><tt class="py-lineno">104</tt>  <tt class="py-line">  <tt id="link-10" class="py-name" targets="Variable apiclient.model.BaseModel.no_content_response=apiclient.model.BaseModel-class.html#no_content_response,Variable apiclient.model.JsonModel.no_content_response=apiclient.model.JsonModel-class.html#no_content_response,Variable apiclient.model.MediaModel.no_content_response=apiclient.model.MediaModel-class.html#no_content_response,Variable apiclient.model.ProtocolBufferModel.no_content_response=apiclient.model.ProtocolBufferModel-class.html#no_content_response,Variable apiclient.model.RawModel.no_content_response=apiclient.model.RawModel-class.html#no_content_response"><a title="apiclient.model.BaseModel.no_content_response
+<a name="L104"></a><tt class="py-lineno">104</tt>  <tt class="py-line">  <tt id="link-10" class="py-name" targets="Variable apiclient.model.BaseModel.no_content_response=apiclient.model.BaseModel-class.html#no_content_response,Method apiclient.model.JsonModel.no_content_response()=apiclient.model.JsonModel-class.html#no_content_response,Method apiclient.model.MediaModel.no_content_response()=apiclient.model.MediaModel-class.html#no_content_response,Method apiclient.model.ProtocolBufferModel.no_content_response()=apiclient.model.ProtocolBufferModel-class.html#no_content_response,Method apiclient.model.RawModel.no_content_response()=apiclient.model.RawModel-class.html#no_content_response"><a title="apiclient.model.BaseModel.no_content_response
 apiclient.model.JsonModel.no_content_response
 apiclient.model.MediaModel.no_content_response
 apiclient.model.ProtocolBufferModel.no_content_response
@@ -572,7 +572,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.model.BaseModel-class.html b/docs/epy/apiclient.model.BaseModel-class.html
index a006e03..54bd9f5 100644
--- a/docs/epy/apiclient.model.BaseModel-class.html
+++ b/docs/epy/apiclient.model.BaseModel-class.html
@@ -56,12 +56,8 @@
 <h1 class="epydoc">Class BaseModel</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.model-pysrc.html#BaseModel">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_basemodel" name="class_hierarchy_for_basemodel">
-<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="129,61,215,88"/>
-<area shape="rect" href="apiclient.model.JsonModel-class.html" title="JsonModel" alt="" coords="64,117,147,144"/>
-<area shape="rect" href="apiclient.model.ProtocolBufferModel-class.html" title="ProtocolBufferModel" alt="" coords="171,117,307,144"/>
-<area shape="rect" href="apiclient.model.MediaModel-class.html" title="MediaModel" alt="" coords="5,173,96,200"/>
-<area shape="rect" href="apiclient.model.RawModel-class.html" title="RawModel" alt="" coords="120,173,200,200"/>
-<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="144,5,200,32"/>
+<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="5,5,91,32"/>
+<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="115,5,171,32"/>
 </map>
   <img src="class_hierarchy_for_basemodel.gif" alt='' usemap="#class_hierarchy_for_basemodel" ismap="ismap" class="graph-without-title" />
 </center>
@@ -535,7 +531,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:43 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.model.JsonModel-class.html b/docs/epy/apiclient.model.JsonModel-class.html
index 090247f..17d4ddc 100644
--- a/docs/epy/apiclient.model.JsonModel-class.html
+++ b/docs/epy/apiclient.model.JsonModel-class.html
@@ -56,11 +56,9 @@
 <h1 class="epydoc">Class JsonModel</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.model-pysrc.html#JsonModel">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_jsonmodel" name="class_hierarchy_for_jsonmodel">
-<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="63,61,148,88"/>
-<area shape="rect" href="apiclient.model.JsonModel-class.html" title="JsonModel" alt="" coords="64,117,147,144"/>
-<area shape="rect" href="apiclient.model.MediaModel-class.html" title="MediaModel" alt="" coords="5,173,96,200"/>
-<area shape="rect" href="apiclient.model.RawModel-class.html" title="RawModel" alt="" coords="120,173,200,200"/>
-<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="77,5,133,32"/>
+<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="5,5,91,32"/>
+<area shape="rect" href="apiclient.model.JsonModel-class.html" title="JsonModel" alt="" coords="115,5,197,32"/>
+<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="221,5,277,32"/>
 </map>
   <img src="class_hierarchy_for_jsonmodel.gif" alt='' usemap="#class_hierarchy_for_jsonmodel" ismap="ismap" class="graph-without-title" />
 </center>
@@ -146,6 +144,22 @@
       
     </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.model.JsonModel-class.html#no_content_response" class="summary-sig-name">no_content_response</a>(<span class="summary-sig-arg">self</span>)</span></td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="apiclient.model-pysrc.html#JsonModel.no_content_response">source&nbsp;code</a></span>
+            
+          </td>
+        </tr>
+      </table>
+      
+    </td>
+  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code><a href="apiclient.model.BaseModel-class.html">BaseModel</a></code></b>:
@@ -195,21 +209,21 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="accept"></a><span class="summary-name">accept</span> = <code title="'application/json'"><code class="variable-quote">'</code><code class="variable-string">application/json</code><code class="variable-quote">'</code></code>
+        <a name="accept"></a><span class="summary-name">accept</span> = <code title="'application/json'">'application/json'</code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="content_type"></a><span class="summary-name">content_type</span> = <code title="'application/json'"><code class="variable-quote">'</code><code class="variable-string">application/json</code><code class="variable-quote">'</code></code>
+        <a name="content_type"></a><span class="summary-name">content_type</span> = <code title="'application/json'">'application/json'</code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="alt_param"></a><span class="summary-name">alt_param</span> = <code title="'json'"><code class="variable-quote">'</code><code class="variable-string">json</code><code class="variable-quote">'</code></code>
+        <a name="alt_param"></a><span class="summary-name">alt_param</span> = <code title="'json'">'json'</code>
     </td>
   </tr>
 </table>
@@ -230,13 +244,6 @@
     </table>
   </td>
 </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a href="apiclient.model.JsonModel-class.html#no_content_response" class="summary-name">no_content_response</a>
-    </td>
-  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
@@ -360,36 +367,29 @@
   </dl>
 </td></tr></table>
 </div>
-<br />
-<!-- ==================== PROPERTY DETAILS ==================== -->
-<a name="section-PropertyDetails"></a>
-<table class="details" 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">Property Details</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-PropertyDetails"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
 <a name="no_content_response"></a>
 <div>
 <table class="details" border="1" cellpadding="3"
        cellspacing="0" width="100%" bgcolor="white">
 <tr><td>
-  <h3 class="epydoc">no_content_response</h3>
+  <table width="100%" cellpadding="0" cellspacing="0" border="0">
+  <tr valign="top"><td>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">no_content_response</span>(<span class="sig-arg">self</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="apiclient.model-pysrc.html#JsonModel.no_content_response">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
   
   <dl class="fields">
-    <dt>Get Method:</dt>
-    <dd class="value"><span class="summary-sig"><i>unreachable</i>.no_content_response(<span class="summary-sig-arg">self</span>)</span>
-    </dd>
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@property</code></li>
+    </ul></dd>
+    <dt>Overrides:
+        <a href="apiclient.model.BaseModel-class.html#no_content_response">no_content_response</a>
+    </dt>
   </dl>
 </td></tr></table>
 </div>
@@ -417,7 +417,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.model.MediaModel-class.html b/docs/epy/apiclient.model.MediaModel-class.html
index 86a96ab..7dfa0b4 100644
--- a/docs/epy/apiclient.model.MediaModel-class.html
+++ b/docs/epy/apiclient.model.MediaModel-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class MediaModel</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.model-pysrc.html#MediaModel">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_mediamodel" name="class_hierarchy_for_mediamodel">
-<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="8,61,93,88"/>
-<area shape="rect" href="apiclient.model.JsonModel-class.html" title="JsonModel" alt="" coords="9,117,92,144"/>
-<area shape="rect" href="apiclient.model.MediaModel-class.html" title="MediaModel" alt="" coords="5,173,96,200"/>
-<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="23,5,79,32"/>
+<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="5,5,91,32"/>
+<area shape="rect" href="apiclient.model.JsonModel-class.html" title="JsonModel" alt="" coords="115,5,197,32"/>
+<area shape="rect" href="apiclient.model.MediaModel-class.html" title="MediaModel" alt="" coords="221,5,312,32"/>
+<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="336,5,392,32"/>
 </map>
   <img src="class_hierarchy_for_mediamodel.gif" alt='' usemap="#class_hierarchy_for_mediamodel" ismap="ismap" class="graph-without-title" />
 </center>
@@ -110,6 +110,22 @@
       
     </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.model.MediaModel-class.html#no_content_response" class="summary-sig-name">no_content_response</a>(<span class="summary-sig-arg">self</span>)</span></td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="apiclient.model-pysrc.html#MediaModel.no_content_response">source&nbsp;code</a></span>
+            
+          </td>
+        </tr>
+      </table>
+      
+    </td>
+  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code><a href="apiclient.model.JsonModel-class.html">JsonModel</a></code></b>:
@@ -163,7 +179,7 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="accept"></a><span class="summary-name">accept</span> = <code title="'*/*'"><code class="variable-quote">'</code><code class="variable-string">*/*</code><code class="variable-quote">'</code></code>
+        <a name="accept"></a><span class="summary-name">accept</span> = <code title="'*/*'">'*/*'</code>
     </td>
   </tr>
 <tr>
@@ -177,7 +193,7 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="alt_param"></a><span class="summary-name">alt_param</span> = <code title="'media'"><code class="variable-quote">'</code><code class="variable-string">media</code><code class="variable-quote">'</code></code>
+        <a name="alt_param"></a><span class="summary-name">alt_param</span> = <code title="'media'">'media'</code>
     </td>
   </tr>
 </table>
@@ -198,13 +214,6 @@
     </table>
   </td>
 </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a href="apiclient.model.MediaModel-class.html#no_content_response" class="summary-name">no_content_response</a>
-    </td>
-  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
@@ -265,36 +274,29 @@
   </dl>
 </td></tr></table>
 </div>
-<br />
-<!-- ==================== PROPERTY DETAILS ==================== -->
-<a name="section-PropertyDetails"></a>
-<table class="details" 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">Property Details</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-PropertyDetails"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
 <a name="no_content_response"></a>
 <div>
 <table class="details" border="1" cellpadding="3"
        cellspacing="0" width="100%" bgcolor="white">
 <tr><td>
-  <h3 class="epydoc">no_content_response</h3>
+  <table width="100%" cellpadding="0" cellspacing="0" border="0">
+  <tr valign="top"><td>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">no_content_response</span>(<span class="sig-arg">self</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="apiclient.model-pysrc.html#MediaModel.no_content_response">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
   
   <dl class="fields">
-    <dt>Get Method:</dt>
-    <dd class="value"><span class="summary-sig"><i>unreachable</i>.no_content_response(<span class="summary-sig-arg">self</span>)</span>
-    </dd>
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@property</code></li>
+    </ul></dd>
+    <dt>Overrides:
+        <a href="apiclient.model.BaseModel-class.html#no_content_response">no_content_response</a>
+    </dt>
   </dl>
 </td></tr></table>
 </div>
@@ -322,7 +324,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.model.Model-class.html b/docs/epy/apiclient.model.Model-class.html
index f20bad5..07f8652 100644
--- a/docs/epy/apiclient.model.Model-class.html
+++ b/docs/epy/apiclient.model.Model-class.html
@@ -56,12 +56,7 @@
 <h1 class="epydoc">Class Model</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.model-pysrc.html#Model">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_model" name="class_hierarchy_for_model">
-<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="129,61,215,88"/>
-<area shape="rect" href="apiclient.model.JsonModel-class.html" title="JsonModel" alt="" coords="64,117,147,144"/>
-<area shape="rect" href="apiclient.model.ProtocolBufferModel-class.html" title="ProtocolBufferModel" alt="" coords="171,117,307,144"/>
-<area shape="rect" href="apiclient.model.MediaModel-class.html" title="MediaModel" alt="" coords="5,173,96,200"/>
-<area shape="rect" href="apiclient.model.RawModel-class.html" title="RawModel" alt="" coords="120,173,200,200"/>
-<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="144,5,200,32"/>
+<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="5,5,61,32"/>
 </map>
   <img src="class_hierarchy_for_model.gif" alt='' usemap="#class_hierarchy_for_model" ismap="ismap" class="graph-without-title" />
 </center>
@@ -294,7 +289,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.model.ProtocolBufferModel-class.html b/docs/epy/apiclient.model.ProtocolBufferModel-class.html
index 3989d54..e7411f8 100644
--- a/docs/epy/apiclient.model.ProtocolBufferModel-class.html
+++ b/docs/epy/apiclient.model.ProtocolBufferModel-class.html
@@ -56,9 +56,9 @@
 <h1 class="epydoc">Class ProtocolBufferModel</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.model-pysrc.html#ProtocolBufferModel">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_protocolbu" name="class_hierarchy_for_protocolbu">
-<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="31,61,116,88"/>
-<area shape="rect" href="apiclient.model.ProtocolBufferModel-class.html" title="ProtocolBufferModel" alt="" coords="5,117,141,144"/>
-<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="45,5,101,32"/>
+<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="5,5,91,32"/>
+<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="115,5,171,32"/>
+<area shape="rect" href="apiclient.model.ProtocolBufferModel-class.html" title="ProtocolBufferModel" alt="" coords="195,5,331,32"/>
 </map>
   <img src="class_hierarchy_for_protocolbu.gif" alt='' usemap="#class_hierarchy_for_protocolbu" ismap="ismap" class="graph-without-title" />
 </center>
@@ -144,6 +144,22 @@
       
     </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.model.ProtocolBufferModel-class.html#no_content_response" class="summary-sig-name">no_content_response</a>(<span class="summary-sig-arg">self</span>)</span></td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="apiclient.model-pysrc.html#ProtocolBufferModel.no_content_response">source&nbsp;code</a></span>
+            
+          </td>
+        </tr>
+      </table>
+      
+    </td>
+  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code><a href="apiclient.model.BaseModel-class.html">BaseModel</a></code></b>:
@@ -193,21 +209,21 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="accept"></a><span class="summary-name">accept</span> = <code title="'application/x-protobuf'"><code class="variable-quote">'</code><code class="variable-string">application/x-protobuf</code><code class="variable-quote">'</code></code>
+        <a name="accept"></a><span class="summary-name">accept</span> = <code title="'application/x-protobuf'">'application/x-protobuf'</code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="content_type"></a><span class="summary-name">content_type</span> = <code title="'application/x-protobuf'"><code class="variable-quote">'</code><code class="variable-string">application/x-protobuf</code><code class="variable-quote">'</code></code>
+        <a name="content_type"></a><span class="summary-name">content_type</span> = <code title="'application/x-protobuf'">'application/x-protobuf'</code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="alt_param"></a><span class="summary-name">alt_param</span> = <code title="'proto'"><code class="variable-quote">'</code><code class="variable-string">proto</code><code class="variable-quote">'</code></code>
+        <a name="alt_param"></a><span class="summary-name">alt_param</span> = <code title="'proto'">'proto'</code>
     </td>
   </tr>
 </table>
@@ -228,13 +244,6 @@
     </table>
   </td>
 </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a href="apiclient.model.ProtocolBufferModel-class.html#no_content_response" class="summary-name">no_content_response</a>
-    </td>
-  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
@@ -362,36 +371,29 @@
   </dl>
 </td></tr></table>
 </div>
-<br />
-<!-- ==================== PROPERTY DETAILS ==================== -->
-<a name="section-PropertyDetails"></a>
-<table class="details" 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">Property Details</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-PropertyDetails"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
 <a name="no_content_response"></a>
 <div>
 <table class="details" border="1" cellpadding="3"
        cellspacing="0" width="100%" bgcolor="white">
 <tr><td>
-  <h3 class="epydoc">no_content_response</h3>
+  <table width="100%" cellpadding="0" cellspacing="0" border="0">
+  <tr valign="top"><td>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">no_content_response</span>(<span class="sig-arg">self</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="apiclient.model-pysrc.html#ProtocolBufferModel.no_content_response">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
   
   <dl class="fields">
-    <dt>Get Method:</dt>
-    <dd class="value"><span class="summary-sig"><i>unreachable</i>.no_content_response(<span class="summary-sig-arg">self</span>)</span>
-    </dd>
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@property</code></li>
+    </ul></dd>
+    <dt>Overrides:
+        <a href="apiclient.model.BaseModel-class.html#no_content_response">no_content_response</a>
+    </dt>
   </dl>
 </td></tr></table>
 </div>
@@ -419,7 +421,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.model.RawModel-class.html b/docs/epy/apiclient.model.RawModel-class.html
index db46bf3..bdad69e 100644
--- a/docs/epy/apiclient.model.RawModel-class.html
+++ b/docs/epy/apiclient.model.RawModel-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class RawModel</h1><p class="nomargin-top"><span class="codelink"><a href="apiclient.model-pysrc.html#RawModel">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_rawmodel" name="class_hierarchy_for_rawmodel">
-<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="5,61,91,88"/>
-<area shape="rect" href="apiclient.model.JsonModel-class.html" title="JsonModel" alt="" coords="7,117,89,144"/>
-<area shape="rect" href="apiclient.model.RawModel-class.html" title="RawModel" alt="" coords="8,173,88,200"/>
-<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="20,5,76,32"/>
+<area shape="rect" href="apiclient.model.BaseModel-class.html" title="BaseModel" alt="" coords="5,5,91,32"/>
+<area shape="rect" href="apiclient.model.JsonModel-class.html" title="JsonModel" alt="" coords="115,5,197,32"/>
+<area shape="rect" href="apiclient.model.Model-class.html" title="Model" alt="" coords="221,5,277,32"/>
+<area shape="rect" href="apiclient.model.RawModel-class.html" title="RawModel" alt="" coords="301,5,381,32"/>
 </map>
   <img src="class_hierarchy_for_rawmodel.gif" alt='' usemap="#class_hierarchy_for_rawmodel" ismap="ismap" class="graph-without-title" />
 </center>
@@ -110,6 +110,22 @@
       
     </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.model.RawModel-class.html#no_content_response" class="summary-sig-name">no_content_response</a>(<span class="summary-sig-arg">self</span>)</span></td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="apiclient.model-pysrc.html#RawModel.no_content_response">source&nbsp;code</a></span>
+            
+          </td>
+        </tr>
+      </table>
+      
+    </td>
+  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code><a href="apiclient.model.JsonModel-class.html">JsonModel</a></code></b>:
@@ -163,7 +179,7 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="accept"></a><span class="summary-name">accept</span> = <code title="'*/*'"><code class="variable-quote">'</code><code class="variable-string">*/*</code><code class="variable-quote">'</code></code>
+        <a name="accept"></a><span class="summary-name">accept</span> = <code title="'*/*'">'*/*'</code>
     </td>
   </tr>
 <tr>
@@ -198,13 +214,6 @@
     </table>
   </td>
 </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a href="apiclient.model.RawModel-class.html#no_content_response" class="summary-name">no_content_response</a>
-    </td>
-  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
@@ -265,36 +274,29 @@
   </dl>
 </td></tr></table>
 </div>
-<br />
-<!-- ==================== PROPERTY DETAILS ==================== -->
-<a name="section-PropertyDetails"></a>
-<table class="details" 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">Property Details</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-PropertyDetails"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
 <a name="no_content_response"></a>
 <div>
 <table class="details" border="1" cellpadding="3"
        cellspacing="0" width="100%" bgcolor="white">
 <tr><td>
-  <h3 class="epydoc">no_content_response</h3>
+  <table width="100%" cellpadding="0" cellspacing="0" border="0">
+  <tr valign="top"><td>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">no_content_response</span>(<span class="sig-arg">self</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="apiclient.model-pysrc.html#RawModel.no_content_response">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
   
   <dl class="fields">
-    <dt>Get Method:</dt>
-    <dd class="value"><span class="summary-sig"><i>unreachable</i>.no_content_response(<span class="summary-sig-arg">self</span>)</span>
-    </dd>
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@property</code></li>
+    </ul></dd>
+    <dt>Overrides:
+        <a href="apiclient.model.BaseModel-class.html#no_content_response">no_content_response</a>
+    </dt>
   </dl>
 </td></tr></table>
 </div>
@@ -322,7 +324,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.schema-module.html b/docs/epy/apiclient.schema-module.html
index 4f2053f..eb307d8 100644
--- a/docs/epy/apiclient.schema-module.html
+++ b/docs/epy/apiclient.schema-module.html
@@ -138,31 +138,6 @@
     </td>
   </tr>
 </table>
-<!-- ==================== VARIABLES ==================== -->
-<a name="section-Variables"></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">Variables</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Variables"
-         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">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'apiclient'"><code class="variable-quote">'</code><code class="variable-string">apiclient</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
-</table>
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -186,7 +161,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.schema-pysrc.html b/docs/epy/apiclient.schema-pysrc.html
index e6deea4..7ec3222 100644
--- a/docs/epy/apiclient.schema-pysrc.html
+++ b/docs/epy/apiclient.schema-pysrc.html
@@ -427,7 +427,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.schema.Schemas-class.html b/docs/epy/apiclient.schema.Schemas-class.html
index ca322f5..0038eaf 100644
--- a/docs/epy/apiclient.schema.Schemas-class.html
+++ b/docs/epy/apiclient.schema.Schemas-class.html
@@ -108,11 +108,13 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.schema.Schemas-class.html#_prettyPrintByName" class="summary-sig-name" onclick="show_private();">_prettyPrintByName</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="apiclient.schema.Schemas-class.html#_prettyPrintByName" class="summary-sig-name" onclick="show_private();">_prettyPrintByName</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">name</span>,
+        <span class="summary-sig-arg">seen</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">dent</span>=<span class="summary-sig-default">0</span>)</span><br />
       Get pretty printed object prototype from the schema name.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.schema-pysrc.html#Schemas._prettyPrintByName">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -144,11 +146,13 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.schema.Schemas-class.html#_prettyPrintSchema" class="summary-sig-name" onclick="show_private();">_prettyPrintSchema</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="apiclient.schema.Schemas-class.html#_prettyPrintSchema" class="summary-sig-name" onclick="show_private();">_prettyPrintSchema</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">schema</span>,
+        <span class="summary-sig-arg">seen</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">dent</span>=<span class="summary-sig-default">0</span>)</span><br />
       Get pretty printed object prototype of schema.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.schema-pysrc.html#Schemas._prettyPrintSchema">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -292,11 +296,13 @@
 <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">_prettyPrintByName</span>(<span class="sig-arg">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">_prettyPrintByName</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">name</span>,
+        <span class="sig-arg">seen</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">dent</span>=<span class="sig-default">0</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.schema-pysrc.html#Schemas._prettyPrintByName">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -358,11 +364,13 @@
 <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">_prettyPrintSchema</span>(<span class="sig-arg">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">_prettyPrintSchema</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">schema</span>,
+        <span class="sig-arg">seen</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">dent</span>=<span class="sig-default">0</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.schema-pysrc.html#Schemas._prettyPrintSchema">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -467,7 +475,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/apiclient.schema._SchemaToStruct-class.html b/docs/epy/apiclient.schema._SchemaToStruct-class.html
index 2c120d9..a813ccc 100644
--- a/docs/epy/apiclient.schema._SchemaToStruct-class.html
+++ b/docs/epy/apiclient.schema._SchemaToStruct-class.html
@@ -90,11 +90,13 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="apiclient.schema._SchemaToStruct-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 />
+          <td><span class="summary-sig"><a href="apiclient.schema._SchemaToStruct-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">schema</span>,
+        <span class="summary-sig-arg">seen</span>,
+        <span class="summary-sig-arg">dent</span>=<span class="summary-sig-default">0</span>)</span><br />
       Constructor.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="apiclient.schema-pysrc.html#_SchemaToStruct.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -296,12 +298,14 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">schema</span>,
+        <span class="sig-arg">seen</span>,
+        <span class="sig-arg">dent</span>=<span class="sig-default">0</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="apiclient.schema-pysrc.html#_SchemaToStruct.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -492,7 +496,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/class-tree.html b/docs/epy/class-tree.html
index e062d39..a7bb7f9 100644
--- a/docs/epy/class-tree.html
+++ b/docs/epy/class-tree.html
@@ -54,47 +54,13 @@
 <ul class="nomargin-top">
     <li> <strong class="uidlink">SocketServer.BaseRequestHandler</strong>:
       <em class="summary">Base class for request handler classes.</em>
-    <ul>
-    <li> <strong class="uidlink">SocketServer.StreamRequestHandler</strong>:
-      <em class="summary">Define self.rfile and self.wfile for stream sockets.</em>
-    <ul>
-    <li> <strong class="uidlink">BaseHTTPServer.BaseHTTPRequestHandler</strong>:
-      <em class="summary">HTTP request handler base class.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.tools.ClientRedirectHandler-class.html" onclick="show_private();">oauth2client.tools.ClientRedirectHandler</a></strong>:
-      <em class="summary">A handler for OAuth 2.0 redirects back to localhost.</em>
-    </li>
-    </ul>
-    </li>
-    </ul>
-    </li>
-    </ul>
     </li>
     <li> <strong class="uidlink">SocketServer.BaseServer</strong>:
       <em class="summary">Base class for server classes.</em>
-    <ul>
-    <li> <strong class="uidlink">SocketServer.TCPServer</strong>:
-      <em class="summary">Base class for various socket-based server classes.</em>
-    <ul>
-    <li> <strong class="uidlink">BaseHTTPServer.HTTPServer</strong>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.tools.ClientRedirectServer-class.html" onclick="show_private();">oauth2client.tools.ClientRedirectServer</a></strong>:
-      <em class="summary">A server to handle OAuth 2.0 redirects back to localhost.</em>
     </li>
-    </ul>
+    <li> <strong class="uidlink">django.db.models.Field</strong>
     </li>
-    </ul>
-    </li>
-    </ul>
-    </li>
-    <li> <strong class="uidlink">rfc822.Message</strong>:
-      <em class="summary">Represents a single RFC 2822-compliant message.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="mimetools.Message-class.html">mimetools.Message</a></strong>:
-      <em class="summary">A derived class of rfc822.Message that knows about MIME headers and
-contains some hooks for decoding encoded and multipart messages.</em>
-    </li>
-    </ul>
+    <li> <strong class="uidlink">django.db.models.Field</strong>
     </li>
     <li> <strong class="uidlink">object</strong>:
       <em class="summary">The most base type</em>
@@ -110,87 +76,23 @@
     </li>
     <li> <strong class="uidlink"><a href="oauth2client.crypt.AppIdentityError-class.html">oauth2client.crypt.AppIdentityError</a></strong>
     </li>
-    <li> <strong class="uidlink"><a href="oauth2client.locked_file.CredentialsFileSymbolicLinkError-class.html">oauth2client.locked_file.CredentialsFileSymbolicLinkError</a></strong>:
-      <em class="summary">Credentials files must not be symbolic links.</em>
-    </li>
     <li> <strong class="uidlink"><a href="oauth2client.file.CredentialsFileSymbolicLinkError-class.html">oauth2client.file.CredentialsFileSymbolicLinkError</a></strong>:
       <em class="summary">Credentials files must not be symbolic links.</em>
     </li>
-    <li> <strong class="uidlink"><a href="oauth2client.multistore_file.Error-class.html">oauth2client.multistore_file.Error</a></strong>:
-      <em class="summary">Base error for this module.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.multistore_file.NewerCredentialStoreError-class.html">oauth2client.multistore_file.NewerCredentialStoreError</a></strong>:
-      <em class="summary">The credential store is a newer version that supported.</em>
-    </li>
-    </ul>
+    <li> <strong class="uidlink"><a href="oauth2client.locked_file.CredentialsFileSymbolicLinkError-class.html">oauth2client.locked_file.CredentialsFileSymbolicLinkError</a></strong>:
+      <em class="summary">Credentials files must not be symbolic links.</em>
     </li>
     <li> <strong class="uidlink"><a href="oauth2client.client.Error-class.html">oauth2client.client.Error</a></strong>:
       <em class="summary">Base error for this module.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.client.AccessTokenCredentialsError-class.html">oauth2client.client.AccessTokenCredentialsError</a></strong>:
-      <em class="summary">Having only the access_token means no refresh is possible.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.client.AccessTokenRefreshError-class.html">oauth2client.client.AccessTokenRefreshError</a></strong>:
-      <em class="summary">Error trying to refresh an expired access token.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.client.FlowExchangeError-class.html">oauth2client.client.FlowExchangeError</a></strong>:
-      <em class="summary">Error trying to exchange an authorization grant for an access token.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.client.UnknownClientSecretsFlowError-class.html">oauth2client.client.UnknownClientSecretsFlowError</a></strong>:
-      <em class="summary">The client secrets file called for an unknown type of OAuth 2.0 flow.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.client.VerifyJwtTokenError-class.html">oauth2client.client.VerifyJwtTokenError</a></strong>:
-      <em class="summary">Could on retrieve certificates for validation.</em>
-    </li>
-    </ul>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.errors.Error-class.html">apiclient.errors.Error</a></strong>:
-      <em class="summary">Base error for this module.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="apiclient.errors.HttpError-class.html">apiclient.errors.HttpError</a></strong>:
-      <em class="summary">HTTP data was invalid or unexpected.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="apiclient.errors.BatchError-class.html">apiclient.errors.BatchError</a></strong>:
-      <em class="summary">Error occured during batch operations.</em>
-    </li>
-    </ul>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.errors.InvalidChunkSizeError-class.html">apiclient.errors.InvalidChunkSizeError</a></strong>:
-      <em class="summary">The given chunksize is not valid.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.errors.InvalidJsonError-class.html">apiclient.errors.InvalidJsonError</a></strong>:
-      <em class="summary">The JSON returned could not be parsed.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.errors.MediaUploadSizeError-class.html">apiclient.errors.MediaUploadSizeError</a></strong>:
-      <em class="summary">Media is larger than the method can accept.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.errors.ResumableUploadError-class.html">apiclient.errors.ResumableUploadError</a></strong>:
-      <em class="summary">Error occured during resumable upload.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.errors.UnacceptableMimeTypeError-class.html">apiclient.errors.UnacceptableMimeTypeError</a></strong>:
-      <em class="summary">That is an unacceptable mimetype for this operation.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.errors.UnexpectedBodyError-class.html">apiclient.errors.UnexpectedBodyError</a></strong>:
-      <em class="summary">Exception raised by RequestMockBuilder on unexpected bodies.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.errors.UnexpectedMethodError-class.html">apiclient.errors.UnexpectedMethodError</a></strong>:
-      <em class="summary">Exception raised by RequestMockBuilder on unexpected calls.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.errors.UnknownApiNameOrVersion-class.html">apiclient.errors.UnknownApiNameOrVersion</a></strong>:
-      <em class="summary">No API with that name and version exists.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.errors.UnknownLinkType-class.html">apiclient.errors.UnknownLinkType</a></strong>:
-      <em class="summary">Link type unknown or unexpected.</em>
-    </li>
-    </ul>
     </li>
     <li> <strong class="uidlink"><a href="oauth2client.clientsecrets.Error-class.html">oauth2client.clientsecrets.Error</a></strong>:
       <em class="summary">Base error for this module.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.clientsecrets.InvalidClientSecretsError-class.html">oauth2client.clientsecrets.InvalidClientSecretsError</a></strong>:
-      <em class="summary">Format of ClientSecrets file is invalid.</em>
     </li>
-    </ul>
+    <li> <strong class="uidlink"><a href="oauth2client.multistore_file.Error-class.html">oauth2client.multistore_file.Error</a></strong>:
+      <em class="summary">Base error for this module.</em>
+    </li>
+    <li> <strong class="uidlink"><a href="apiclient.errors.Error-class.html">apiclient.errors.Error</a></strong>:
+      <em class="summary">Base error for this module.</em>
     </li>
     <li> <strong class="uidlink"><a href="oauth2client.appengine.InvalidClientSecretsError-class.html">oauth2client.appengine.InvalidClientSecretsError</a></strong>:
       <em class="summary">The client_secrets.json file is malformed or missing required fields.</em>
@@ -207,47 +109,9 @@
     </li>
     <li> <strong class="uidlink"><a href="oauth2client.client.Credentials-class.html">oauth2client.client.Credentials</a></strong>:
       <em class="summary">Base class for all Credentials objects.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.client.OAuth2Credentials-class.html">oauth2client.client.OAuth2Credentials</a></strong>:
-      <em class="summary">Credentials object for OAuth 2.0.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.client.AccessTokenCredentials-class.html">oauth2client.client.AccessTokenCredentials</a></strong>:
-      <em class="summary">Credentials object for OAuth 2.0.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.client.AssertionCredentials-class.html">oauth2client.client.AssertionCredentials</a></strong>:
-      <em class="summary">Abstract Credentials object used for OAuth 2.0 assertion grants.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.appengine.AppAssertionCredentials-class.html">oauth2client.appengine.AppAssertionCredentials</a></strong>:
-      <em class="summary">Credentials object for App Engine Assertion Grants</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.gce.AppAssertionCredentials-class.html">oauth2client.gce.AppAssertionCredentials</a></strong>:
-      <em class="summary">Credentials object for Compute Engine Assertion Grants</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.client.SignedJwtAssertionCredentials-class.html">oauth2client.client.SignedJwtAssertionCredentials</a></strong>:
-      <em class="summary">Credentials object used for OAuth 2.0 Signed JWT assertion grants.</em>
-    </li>
-    </ul>
-    </li>
-    </ul>
-    </li>
-    </ul>
-    </li>
-    <li> <strong class="uidlink">django.db.models.fields.Field</strong>:
-      <em class="summary">Base class for all field types</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.django_orm.CredentialsField-class.html">oauth2client.django_orm.CredentialsField</a></strong>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.django_orm.FlowField-class.html">oauth2client.django_orm.FlowField</a></strong>
-    </li>
-    </ul>
     </li>
     <li> <strong class="uidlink"><a href="oauth2client.client.Flow-class.html">oauth2client.client.Flow</a></strong>:
       <em class="summary">Base class for all Flow objects.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.client.OAuth2WebServerFlow-class.html">oauth2client.client.OAuth2WebServerFlow</a></strong>:
-      <em class="summary">Does the Web Server Flow for OAuth 2.0.</em>
-    </li>
-    </ul>
     </li>
     <li> <strong class="uidlink"><a href="apiclient.http.HttpMock-class.html">apiclient.http.HttpMock</a></strong>:
       <em class="summary">Mock of httplib2.Http</em>
@@ -272,19 +136,6 @@
     </li>
     <li> <strong class="uidlink"><a href="apiclient.http.MediaUpload-class.html">apiclient.http.MediaUpload</a></strong>:
       <em class="summary">Describes a media object to upload.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="apiclient.http.MediaIoBaseUpload-class.html">apiclient.http.MediaIoBaseUpload</a></strong>:
-      <em class="summary">A MediaUpload for a io.Base objects.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="apiclient.http.MediaFileUpload-class.html">apiclient.http.MediaFileUpload</a></strong>:
-      <em class="summary">A MediaUpload for a file.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.http.MediaInMemoryUpload-class.html">apiclient.http.MediaInMemoryUpload</a></strong>:
-      <em class="summary">MediaUpload for a chunk of bytes.</em>
-    </li>
-    </ul>
-    </li>
-    </ul>
     </li>
     <li> <strong class="uidlink"><a href="apiclient.http.MediaUploadProgress-class.html">apiclient.http.MediaUploadProgress</a></strong>:
       <em class="summary">Status of a resumable upload.</em>
@@ -292,59 +143,17 @@
     <li> <strong class="uidlink"><a href="oauth2client.client.MemoryCache-class.html">oauth2client.client.MemoryCache</a></strong>:
       <em class="summary">httplib2 Cache implementation which only caches locally.</em>
     </li>
-    <li> <strong class="uidlink"><a href="apiclient.model.Model-class.html">apiclient.model.Model</a></strong>:
-      <em class="summary">Model base class.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="apiclient.model.BaseModel-class.html">apiclient.model.BaseModel</a></strong>:
-      <em class="summary">Base model class.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="apiclient.model.JsonModel-class.html">apiclient.model.JsonModel</a></strong>:
-      <em class="summary">Model class for JSON.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="apiclient.model.MediaModel-class.html">apiclient.model.MediaModel</a></strong>:
-      <em class="summary">Model class for requests that return Media.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.model.RawModel-class.html">apiclient.model.RawModel</a></strong>:
-      <em class="summary">Model class for requests that don't return JSON.</em>
-    </li>
-    </ul>
-    </li>
-    <li> <strong class="uidlink"><a href="apiclient.model.ProtocolBufferModel-class.html">apiclient.model.ProtocolBufferModel</a></strong>:
-      <em class="summary">Model class for protocol buffers.</em>
-    </li>
-    </ul>
-    </li>
-    </ul>
-    </li>
     <li> <strong class="uidlink">google.appengine.ext.db.Model</strong>:
       <em class="summary">Model is the superclass of all object entities in the datastore.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.appengine.CredentialsModel-class.html">oauth2client.appengine.CredentialsModel</a></strong>:
-      <em class="summary">Storage for OAuth 2.0 Credentials</em>
     </li>
-    <li> <strong class="uidlink"><a href="oauth2client.appengine.SiteXsrfSecretKey-class.html">oauth2client.appengine.SiteXsrfSecretKey</a></strong>:
-      <em class="summary">Storage for the sites XSRF secret key.</em>
-    </li>
-    </ul>
+    <li> <strong class="uidlink"><a href="apiclient.model.Model-class.html">apiclient.model.Model</a></strong>:
+      <em class="summary">Model base class.</em>
     </li>
     <li> <strong class="uidlink"><a href="oauth2client.appengine.OAuth2Decorator-class.html">oauth2client.appengine.OAuth2Decorator</a></strong>:
       <em class="summary">Utility for making OAuth 2.0 easier.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html">oauth2client.appengine.OAuth2DecoratorFromClientSecrets</a></strong>:
-      <em class="summary">An OAuth2Decorator that builds from a clientsecrets file.</em>
-    </li>
-    </ul>
     </li>
     <li> <strong class="uidlink">google.appengine.ext.db.Property</strong>:
       <em class="summary">A Property is an attribute of a Model.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.appengine.CredentialsProperty-class.html">oauth2client.appengine.CredentialsProperty</a></strong>:
-      <em class="summary">App Engine datastore Property for Credentials.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.appengine.FlowProperty-class.html">oauth2client.appengine.FlowProperty</a></strong>:
-      <em class="summary">App Engine datastore Property for Flow.</em>
-    </li>
-    </ul>
     </li>
     <li> <strong class="uidlink"><a href="apiclient.http.RequestMockBuilder-class.html">apiclient.http.RequestMockBuilder</a></strong>:
       <em class="summary">A simple mock of HttpRequest</em>
@@ -357,25 +166,6 @@
     </li>
     <li> <strong class="uidlink"><a href="oauth2client.client.Storage-class.html">oauth2client.client.Storage</a></strong>:
       <em class="summary">Base class for all Storage objects.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.file.Storage-class.html">oauth2client.file.Storage</a></strong>:
-      <em class="summary">Store and retrieve a single credential to and from a file.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.django_orm.Storage-class.html">oauth2client.django_orm.Storage</a></strong>:
-      <em class="summary">Store and retrieve a single credential to and from
-the datastore.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.keyring_storage.Storage-class.html">oauth2client.keyring_storage.Storage</a></strong>:
-      <em class="summary">Store and retrieve a single credential to and from the keyring.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.appengine.StorageByKeyName-class.html">oauth2client.appengine.StorageByKeyName</a></strong>:
-      <em class="summary">Store and retrieve a single credential to and from
-the App Engine datastore.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.multistore_file._MultiStore._Storage-class.html" onclick="show_private();">oauth2client.multistore_file._MultiStore._Storage</a></strong>:
-      <em class="summary">A Storage object that knows how to read/write a single credential.</em>
-    </li>
-    </ul>
     </li>
     <li> <strong class="uidlink"><a href="oauth2client.crypt.Verifier-class.html">oauth2client.crypt.Verifier</a></strong>:
       <em class="summary">Verifies the signature on a message.</em>
@@ -385,14 +175,6 @@
     </li>
     <li> <strong class="uidlink"><a href="oauth2client.locked_file._Opener-class.html" onclick="show_private();">oauth2client.locked_file._Opener</a></strong>:
       <em class="summary">Base class for different locking primitives.</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="oauth2client.locked_file._FcntlOpener-class.html" onclick="show_private();">oauth2client.locked_file._FcntlOpener</a></strong>:
-      <em class="summary">Open, lock, and unlock a file using fcntl.lockf.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="oauth2client.locked_file._PosixOpener-class.html" onclick="show_private();">oauth2client.locked_file._PosixOpener</a></strong>:
-      <em class="summary">Lock files using Posix advisory lock files.</em>
-    </li>
-    </ul>
     </li>
     <li> <strong class="uidlink"><a href="apiclient.schema._SchemaToStruct-class.html" onclick="show_private();">apiclient.schema._SchemaToStruct</a></strong>:
       <em class="summary">Convert schema to a prototype object.</em>
@@ -402,14 +184,6 @@
     </li>
     <li> <strong class="uidlink">type</strong>:
       <em class="summary">type(object) -&gt; the object's type...</em>
-    <ul>
-    <li> <strong class="uidlink"><a href="google.appengine.ext.db.PropertiedClass-class.html">google.appengine.ext.db.PropertiedClass</a></strong>:
-      <em class="summary">Meta-class for initializing Model classes properties.</em>
-    </li>
-    <li> <strong class="uidlink"><a href="django.db.models.fields.subclassing.SubfieldBase-class.html">django.db.models.fields.subclassing.SubfieldBase</a></strong>:
-      <em class="summary">A metaclass for custom Field subclasses.</em>
-    </li>
-    </ul>
     </li>
     </ul>
     </li>
@@ -437,7 +211,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:41 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/django.db.models.fields.subclassing.SubfieldBase-class.html b/docs/epy/django.db.models.fields.subclassing.SubfieldBase-class.html
index e2bc674..786415e 100644
--- a/docs/epy/django.db.models.fields.subclassing.SubfieldBase-class.html
+++ b/docs/epy/django.db.models.fields.subclassing.SubfieldBase-class.html
@@ -276,7 +276,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 12:25:02 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/google.appengine.ext.db.PropertiedClass-class.html b/docs/epy/google.appengine.ext.db.PropertiedClass-class.html
index 9419e33..d8b837c 100644
--- a/docs/epy/google.appengine.ext.db.PropertiedClass-class.html
+++ b/docs/epy/google.appengine.ext.db.PropertiedClass-class.html
@@ -59,8 +59,8 @@
 <h1 class="epydoc">Type PropertiedClass</h1><p class="nomargin-top"></p>
 <center>
 <center>  <map id="class_hierarchy_for_propertied" name="class_hierarchy_for_propertied">
-<area shape="rect" href="google.appengine.ext.db.PropertiedClass-class.html" title="PropertiedClass" alt="" coords="5,61,117,88"/>
-<area shape="rect" href="javascript:void(0);" title="type" alt="" coords="39,5,84,32"/>
+<area shape="rect" href="google.appengine.ext.db.PropertiedClass-class.html" title="PropertiedClass" alt="" coords="5,5,117,32"/>
+<area shape="rect" href="javascript:void(0);" title="type" alt="" coords="141,5,187,32"/>
 </map>
   <img src="class_hierarchy_for_propertied.gif" alt='' usemap="#class_hierarchy_for_propertied" ismap="ismap" class="graph-without-title" />
 </center>
@@ -294,7 +294,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/help.html b/docs/epy/help.html
index dea9bdc..bb3f8a2 100644
--- a/docs/epy/help.html
+++ b/docs/epy/help.html
@@ -240,7 +240,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:41 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/identifier-index.html b/docs/epy/identifier-index.html
index 6ade058..fdcdc8c 100644
--- a/docs/epy/identifier-index.html
+++ b/docs/epy/identifier-index.html
@@ -125,7 +125,7 @@
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.Credentials-class.html">Credentials</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.model.JsonModel-class.html#alt_param">alt_param</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model.JsonModel-class.html">JsonModel</a>)</span></td>
@@ -189,7 +189,8 @@
 <span class="index-where">(in&nbsp;<a href="apiclient.errors-module.html">apiclient.errors</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.mimeparse-module.html#best_match">best_match()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.mimeparse-module.html">apiclient.mimeparse</a>)</span></td>
-<td width="33%" class="link-index">&nbsp;</td>
+<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#build_from_document">build_from_document()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
 </tr>
 </table>
 </td></tr>
@@ -201,7 +202,7 @@
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.crypt-module.html#CLOCK_SKEW_SECS">CLOCK_SKEW_SECS</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.crypt-module.html">oauth2client.crypt</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.Credentials-class.html">Credentials</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.client-module.html#credentials_from_code">credentials_from_code()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 </tr>
 <tr>
@@ -213,7 +214,7 @@
 <span class="index-where">(in&nbsp;<a href="oauth2client.django_orm-module.html">oauth2client.django_orm</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#callback_path">callback_path</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#callback_path">callback_path()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.model.JsonModel-class.html#content_type">content_type</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model.JsonModel-class.html">JsonModel</a>)</span></td>
@@ -247,23 +248,23 @@
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.tools.ClientRedirectHandler-class.html">ClientRedirectHandler</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.tools-module.html">oauth2client.tools</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.django_orm.CredentialsField-class.html#contribute_to_class">contribute_to_class()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.CredentialsField-class.html">CredentialsField</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.CredentialsModel-class.html#credentials">credentials</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.CredentialsModel-class.html">CredentialsModel</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.crypt-module.html">crypt</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client-module.html">oauth2client</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.tools.ClientRedirectServer-class.html">ClientRedirectServer</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.tools-module.html">oauth2client.tools</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.django_orm.FlowField-class.html#contribute_to_class">contribute_to_class()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.FlowField-class.html">FlowField</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.Credentials-class.html">Credentials</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 <td width="33%" class="link-index">&nbsp;</td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.clientsecrets-module.html">clientsecrets</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client-module.html">oauth2client</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.CredentialsModel-class.html#credentials">credentials</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.CredentialsModel-class.html">CredentialsModel</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client-module.html#credentials_from_clientsecrets_and_code">credentials_from_clientsecrets_and_code()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 <td width="33%" class="link-index">&nbsp;</td>
 </tr>
 </table>
@@ -272,45 +273,52 @@
 <td valign="top">
 <table class="link-index" width="100%" border="1">
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http-module.html#DEFAULT_CHUNK_SIZE">DEFAULT_CHUNK_SIZE</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.xsrfutil-module.html#DELIMITER">DELIMITER</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.xsrfutil-module.html">oauth2client.xsrfutil</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.CredentialsProperty-class.html#data_type">data_type</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.CredentialsProperty-class.html">CredentialsProperty</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.Storage-class.html#delete">delete()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.Storage-class.html">Storage</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.model.RawModel-class.html#deserialize">deserialize()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model.RawModel-class.html">RawModel</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#DEFAULT_METHOD_DOC">DEFAULT_METHOD_DOC</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model.BaseModel-class.html#deserialize">deserialize()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.model.BaseModel-class.html">BaseModel</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.FlowProperty-class.html#data_type">data_type</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.FlowProperty-class.html">FlowProperty</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.xsrfutil-module.html#DELIMITER">DELIMITER</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.xsrfutil-module.html">oauth2client.xsrfutil</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.discovery-module.html">discovery</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient-module.html">apiclient</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.xsrfutil-module.html#DEFAULT_TIMEOUT_SECS">DEFAULT_TIMEOUT_SECS</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.xsrfutil-module.html">oauth2client.xsrfutil</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model.JsonModel-class.html#deserialize">deserialize()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.model.JsonModel-class.html">JsonModel</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http-module.html#DEFAULT_CHUNK_SIZE">DEFAULT_CHUNK_SIZE</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.model.BaseModel-class.html#deserialize">deserialize()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.model.BaseModel-class.html">BaseModel</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.discovery-module.html#DISCOVERY_URI">DISCOVERY_URI</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.client.MemoryCache-class.html#delete">delete()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.MemoryCache-class.html">MemoryCache</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model.MediaModel-class.html#deserialize">deserialize()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.model.MediaModel-class.html">MediaModel</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#DEFAULT_METHOD_DOC">DEFAULT_METHOD_DOC</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.model.JsonModel-class.html#deserialize">deserialize()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.model.JsonModel-class.html">JsonModel</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.django_orm-module.html">django_orm</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client-module.html">oauth2client</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.client.Storage-class.html#delete">delete()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.Storage-class.html">Storage</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model.ProtocolBufferModel-class.html#deserialize">deserialize()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.model.ProtocolBufferModel-class.html">ProtocolBufferModel</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.xsrfutil-module.html#DEFAULT_TIMEOUT_SECS">DEFAULT_TIMEOUT_SECS</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.xsrfutil-module.html">oauth2client.xsrfutil</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.model.MediaModel-class.html#deserialize">deserialize()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.model.MediaModel-class.html">MediaModel</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.tools.ClientRedirectHandler-class.html#do_GET">do_GET()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.tools.ClientRedirectHandler-class.html" onclick="show_private();">ClientRedirectHandler</a>)</span></td>
 </tr>
+<tr>
+<td width="33%" class="link-index"><a href="oauth2client.client.MemoryCache-class.html#delete">delete()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.MemoryCache-class.html">MemoryCache</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.model.ProtocolBufferModel-class.html#deserialize">deserialize()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.model.ProtocolBufferModel-class.html">ProtocolBufferModel</a>)</span></td>
+<td width="33%" class="link-index">&nbsp;</td>
+</tr>
 </table>
 </td></tr>
 <tr valign="top"><td valign="top" width="1%"><h2 class="epydoc"><a name="E">E</a></h2></td>
@@ -363,66 +371,72 @@
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.file-module.html">file</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client-module.html">oauth2client</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.tools-module.html#FLAGS">FLAGS</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.tools-module.html">oauth2client.tools</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.AppAssertionCredentials-class.html#from_json">from_json()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.AppAssertionCredentials-class.html">AppAssertionCredentials</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file.LockedFile-class.html#file_handle">file_handle()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file.LockedFile-class.html">LockedFile</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.util-module.html#FLAGS">FLAGS</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.util-module.html">oauth2client.util</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client.AccessTokenCredentials-class.html#from_json">from_json()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.AccessTokenCredentials-class.html">AccessTokenCredentials</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file._Opener-class.html#file_handle">file_handle()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._Opener-class.html" onclick="show_private();">_Opener</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.locked_file.LockedFile-class.html#file_handle">file_handle()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file.LockedFile-class.html">LockedFile</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client.Flow-class.html">Flow</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client.Credentials-class.html#from_json">from_json()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.Credentials-class.html">Credentials</a>)</span></td>
 </tr>
 <tr>
+<td width="33%" class="link-index"><a href="oauth2client.locked_file._Opener-class.html#file_handle">file_handle()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._Opener-class.html" onclick="show_private();">_Opener</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client-module.html#flow_from_clientsecrets">flow_from_clientsecrets()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#from_json">from_json()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
+</tr>
+<tr>
 <td width="33%" class="link-index"><a href="oauth2client.locked_file.LockedFile-class.html#filename">filename()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.locked_file.LockedFile-class.html">LockedFile</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client.FlowExchangeError-class.html">FlowExchangeError</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#from_json">from_json()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.SignedJwtAssertionCredentials-class.html#from_json">from_json()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.SignedJwtAssertionCredentials-class.html">SignedJwtAssertionCredentials</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.locked_file._Opener-class.html#filename">filename()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._Opener-class.html" onclick="show_private();">_Opener</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.django_orm.FlowField-class.html">FlowField</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.django_orm-module.html">oauth2client.django_orm</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.SignedJwtAssertionCredentials-class.html#from_json">from_json()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.SignedJwtAssertionCredentials-class.html">SignedJwtAssertionCredentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.gce.AppAssertionCredentials-class.html#from_json">from_json()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.gce.AppAssertionCredentials-class.html">AppAssertionCredentials</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.mimeparse-module.html#fitness_and_quality_parsed">fitness_and_quality_parsed()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.mimeparse-module.html">apiclient.mimeparse</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.appengine.FlowProperty-class.html">FlowProperty</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.gce.AppAssertionCredentials-class.html#from_json">from_json()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.gce.AppAssertionCredentials-class.html">AppAssertionCredentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.crypt.Signer-class.html#from_string">from_string()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.crypt.Signer-class.html">Signer</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.discovery-module.html#fix_method_name">fix_method_name()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.HttpRequest-class.html#from_json">from_json()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http.HttpRequest-class.html">HttpRequest</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.crypt.Signer-class.html#from_string">from_string()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.crypt.Signer-class.html">Signer</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.crypt.Verifier-class.html#from_string">from_string()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.crypt.Verifier-class.html">Verifier</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.model-module.html#FLAGS">FLAGS</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model-module.html">apiclient.model</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.MediaFileUpload-class.html#from_json">from_json()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http.MediaFileUpload-class.html">MediaFileUpload</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.crypt.Verifier-class.html#from_string">from_string()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.crypt.Verifier-class.html">Verifier</a>)</span></td>
+<td width="33%" class="link-index">&nbsp;</td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="oauth2client.tools-module.html#FLAGS">FLAGS</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.tools-module.html">oauth2client.tools</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.AppAssertionCredentials-class.html#from_json">from_json()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.AppAssertionCredentials-class.html">AppAssertionCredentials</a>)</span></td>
+<td width="33%" class="link-index">&nbsp;</td>
 </tr>
 </table>
 </td></tr>
@@ -432,34 +446,41 @@
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.gce-module.html">gce</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client-module.html">oauth2client</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.django_orm.CredentialsField-class.html#get_db_prep_value">get_db_prep_value()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.CredentialsField-class.html">CredentialsField</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file-module.html#get_credential_storage">get_credential_storage()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file-module.html">oauth2client.multistore_file</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.appengine.CredentialsProperty-class.html#get_value_for_datastore">get_value_for_datastore()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine.CredentialsProperty-class.html">CredentialsProperty</a>)</span></td>
 </tr>
 <tr>
+<td width="33%" class="link-index"><a href="oauth2client.xsrfutil-module.html#generate_token">generate_token()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.xsrfutil-module.html">oauth2client.xsrfutil</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.django_orm.CredentialsField-class.html#get_db_prep_value">get_db_prep_value()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.CredentialsField-class.html">CredentialsField</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.FlowProperty-class.html#get_value_for_datastore">get_value_for_datastore()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.FlowProperty-class.html">FlowProperty</a>)</span></td>
+</tr>
+<tr>
 <td width="33%" class="link-index"><a href="apiclient.schema.Schemas-class.html#get">get()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.schema.Schemas-class.html">Schemas</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.django_orm.FlowField-class.html#get_db_prep_value">get_db_prep_value()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.FlowField-class.html">FlowField</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.FlowProperty-class.html#get_value_for_datastore">get_value_for_datastore()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.FlowProperty-class.html">FlowProperty</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseUpload-class.html#getbytes">getbytes()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaIoBaseUpload-class.html">MediaIoBaseUpload</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.client.MemoryCache-class.html#get">get()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.MemoryCache-class.html">MemoryCache</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.django_orm.CredentialsField-class.html#get_internal_type">get_internal_type()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.CredentialsField-class.html">CredentialsField</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseUpload-class.html#getbytes">getbytes()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaIoBaseUpload-class.html">MediaIoBaseUpload</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaUpload-class.html#getbytes">getbytes()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaUpload-class.html">MediaUpload</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.client.Storage-class.html#get">get()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.Storage-class.html">Storage</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.django_orm.FlowField-class.html#get_internal_type">get_internal_type()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.FlowField-class.html">FlowField</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaUpload-class.html#getbytes">getbytes()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaUpload-class.html">MediaUpload</a>)</span></td>
+<td width="33%" class="link-index">&nbsp;</td>
 </tr>
 </table>
 </td></tr>
@@ -653,69 +674,69 @@
 <span class="index-where">(in&nbsp;<a href="oauth2client.crypt-module.html">oauth2client.crypt</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.MediaInMemoryUpload-class.html">MediaInMemoryUpload</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.gce-module.html#META">META</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.gce-module.html">oauth2client.gce</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.mimeparse-module.html">mimeparse</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient-module.html">apiclient</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.appengine.CredentialsProperty-class.html#make_value_from_datastore">make_value_from_datastore()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine.CredentialsProperty-class.html">CredentialsProperty</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseDownload-class.html">MediaIoBaseDownload</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.mimeparse-module.html">mimeparse</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient-module.html">apiclient</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseUpload-class.html#mimetype">mimetype()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaIoBaseUpload-class.html">MediaIoBaseUpload</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.appengine.FlowProperty-class.html#make_value_from_datastore">make_value_from_datastore()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine.FlowProperty-class.html">FlowProperty</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseUpload-class.html">MediaIoBaseUpload</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseUpload-class.html#mimetype">mimetype()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaIoBaseUpload-class.html">MediaIoBaseUpload</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaUpload-class.html#mimetype">mimetype()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaUpload-class.html">MediaUpload</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.model-module.html#makepatch">makepatch()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model-module.html">apiclient.model</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.model.MediaModel-class.html">MediaModel</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model-module.html">apiclient.model</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaUpload-class.html#mimetype">mimetype()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaUpload-class.html">MediaUpload</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.model-module.html">model</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient-module.html">apiclient</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.client.SignedJwtAssertionCredentials-class.html#MAX_TOKEN_LIFETIME_SECS">MAX_TOKEN_LIFETIME_SECS</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.SignedJwtAssertionCredentials-class.html">SignedJwtAssertionCredentials</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.MediaUpload-class.html">MediaUpload</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model-module.html">model</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient-module.html">apiclient</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.model.Model-class.html">Model</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.model-module.html">apiclient.model</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.crypt-module.html#MAX_TOKEN_LIFETIME_SECS">MAX_TOKEN_LIFETIME_SECS</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.crypt-module.html">oauth2client.crypt</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.MediaUploadProgress-class.html">MediaUploadProgress</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model.Model-class.html">Model</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.model-module.html">apiclient.model</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#MULTIPLIERS">MULTIPLIERS</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.http-module.html#MAX_URI_LENGTH">MAX_URI_LENGTH</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.errors.MediaUploadSizeError-class.html">MediaUploadSizeError</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.errors-module.html">apiclient.errors</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#MULTIPLIERS">MULTIPLIERS</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file-module.html">multistore_file</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client-module.html">oauth2client</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.http.MediaDownloadProgress-class.html">MediaDownloadProgress</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client.MemoryCache-class.html">MemoryCache</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file-module.html">multistore_file</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client-module.html">oauth2client</a>)</span></td>
+<td width="33%" class="link-index">&nbsp;</td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.http.MediaFileUpload-class.html">MediaFileUpload</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
-<td width="33%" class="link-index"><a href="mimetools.Message-class.html">Message</a></td>
+<td width="33%" class="link-index"><a href="oauth2client.gce-module.html#META">META</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.gce-module.html">oauth2client.gce</a>)</span></td>
 <td width="33%" class="link-index">&nbsp;</td>
 </tr>
 </table>
@@ -728,7 +749,7 @@
 <span class="index-where">(in&nbsp;<a href="apiclient.http.MediaUpload-class.html">MediaUpload</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseDownload-class.html#next_chunk">next_chunk()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http.MediaIoBaseDownload-class.html">MediaIoBaseDownload</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model.ProtocolBufferModel-class.html#no_content_response">no_content_response</a><br />
+<td width="33%" class="link-index"><a href="apiclient.model.ProtocolBufferModel-class.html#no_content_response">no_content_response()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model.ProtocolBufferModel-class.html">ProtocolBufferModel</a>)</span></td>
 </tr>
 <tr>
@@ -736,13 +757,13 @@
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.Credentials-class.html">Credentials</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.model.BaseModel-class.html#no_content_response">no_content_response</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model.BaseModel-class.html">BaseModel</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model.RawModel-class.html#no_content_response">no_content_response</a><br />
+<td width="33%" class="link-index"><a href="apiclient.model.RawModel-class.html#no_content_response">no_content_response()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model.RawModel-class.html">RawModel</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.multistore_file.NewerCredentialStoreError-class.html">NewerCredentialStoreError</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file-module.html">oauth2client.multistore_file</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model.JsonModel-class.html#no_content_response">no_content_response</a><br />
+<td width="33%" class="link-index"><a href="apiclient.model.JsonModel-class.html#no_content_response">no_content_response()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model.JsonModel-class.html">JsonModel</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client.Credentials-class.html#NON_SERIALIZED_MEMBERS">NON_SERIALIZED_MEMBERS</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.Credentials-class.html">Credentials</a>)</span></td>
@@ -750,7 +771,7 @@
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.http.HttpRequest-class.html#next_chunk">next_chunk()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http.HttpRequest-class.html">HttpRequest</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model.MediaModel-class.html#no_content_response">no_content_response</a><br />
+<td width="33%" class="link-index"><a href="apiclient.model.MediaModel-class.html#no_content_response">no_content_response()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model.MediaModel-class.html">MediaModel</a>)</span></td>
 <td width="33%" class="link-index">&nbsp;</td>
 </tr>
@@ -761,23 +782,23 @@
 <table class="link-index" width="100%" border="1">
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client-module.html">oauth2client</a></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2WebServerFlow-class.html">OAuth2WebServerFlow</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file._FcntlOpener-class.html#open_and_lock">open_and_lock()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._FcntlOpener-class.html" onclick="show_private();">_FcntlOpener</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html">OAuth2DecoratorFromClientSecrets</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.locked_file.LockedFile-class.html#open_and_lock">open_and_lock()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file.LockedFile-class.html">LockedFile</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.appengine-module.html#OAUTH2CLIENT_NAMESPACE">OAUTH2CLIENT_NAMESPACE</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#oauth_aware">oauth_aware()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2WebServerFlow-class.html">OAuth2WebServerFlow</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.locked_file._Opener-class.html#open_and_lock">open_and_lock()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._Opener-class.html" onclick="show_private();">_Opener</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#oauth_required">oauth_required()</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#oauth_aware">oauth_aware()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.locked_file._PosixOpener-class.html#open_and_lock">open_and_lock()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._PosixOpener-class.html" onclick="show_private();">_PosixOpener</a>)</span></td>
@@ -785,15 +806,15 @@
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client-module.html#OOB_CALLBACK_URN">OOB_CALLBACK_URN</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#oauth_required">oauth_required()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
 <td width="33%" class="link-index">&nbsp;</td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html">OAuth2DecoratorFromClientSecrets</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.appengine-module.html#oauth2decorator_from_clientsecrets">oauth2decorator_from_clientsecrets()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file.LockedFile-class.html#open_and_lock">open_and_lock()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file.LockedFile-class.html">LockedFile</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client-module.html#OOB_CALLBACK_URN">OOB_CALLBACK_URN</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 <td width="33%" class="link-index">&nbsp;</td>
 </tr>
 </table>
@@ -970,7 +991,7 @@
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client.OAuth2WebServerFlow-class.html#step1_get_authorize_url">step1_get_authorize_url()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2WebServerFlow-class.html">OAuth2WebServerFlow</a>)</span></td>
-<td width="33%" class="link-index"><a href="django.db.models.fields.subclassing.SubfieldBase-class.html">SubfieldBase</a></td>
+<td width="33%" class="link-index">&nbsp;</td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.http-module.html#set_user_agent">set_user_agent()</a><br />
@@ -1030,41 +1051,35 @@
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.errors.UnacceptableMimeTypeError-class.html">UnacceptableMimeTypeError</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.errors-module.html">apiclient.errors</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.errors.UnknownApiNameOrVersion-class.html">UnknownApiNameOrVersion</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.errors-module.html">apiclient.errors</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.locked_file._Opener-class.html#unlock_and_close">unlock_and_close()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._Opener-class.html" onclick="show_private();">_Opener</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="apiclient.schema._SchemaToStruct-class.html#undent">undent()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.schema._SchemaToStruct-class.html" onclick="show_private();">_SchemaToStruct</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client.UnknownClientSecretsFlowError-class.html">UnknownClientSecretsFlowError</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.locked_file._PosixOpener-class.html#unlock_and_close">unlock_and_close()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._PosixOpener-class.html" onclick="show_private();">_PosixOpener</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.schema._SchemaToStruct-class.html#undent">undent()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.schema._SchemaToStruct-class.html" onclick="show_private();">_SchemaToStruct</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.errors.UnexpectedBodyError-class.html">UnexpectedBodyError</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.errors-module.html">apiclient.errors</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.errors.UnknownLinkType-class.html">UnknownLinkType</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.errors-module.html">apiclient.errors</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.discovery-module.html#URITEMPLATE">URITEMPLATE</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.errors.UnexpectedBodyError-class.html">UnexpectedBodyError</a><br />
+<td width="33%" class="link-index"><a href="apiclient.errors.UnexpectedMethodError-class.html">UnexpectedMethodError</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.errors-module.html">apiclient.errors</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.locked_file.LockedFile-class.html#unlock_and_close">unlock_and_close()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.locked_file.LockedFile-class.html">LockedFile</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.util-module.html">util</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client-module.html">oauth2client</a>)</span></td>
 </tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.errors.UnexpectedMethodError-class.html">UnexpectedMethodError</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.errors-module.html">apiclient.errors</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file._FcntlOpener-class.html#unlock_and_close">unlock_and_close()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._FcntlOpener-class.html" onclick="show_private();">_FcntlOpener</a>)</span></td>
-<td width="33%" class="link-index">&nbsp;</td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.errors.UnknownApiNameOrVersion-class.html">UnknownApiNameOrVersion</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.errors-module.html">apiclient.errors</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file._Opener-class.html#unlock_and_close">unlock_and_close()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._Opener-class.html" onclick="show_private();">_Opener</a>)</span></td>
-<td width="33%" class="link-index">&nbsp;</td>
-</tr>
 </table>
 </td></tr>
 <tr valign="top"><td valign="top" width="1%"><h2 class="epydoc"><a name="V">V</a></h2></td>
@@ -1073,10 +1088,10 @@
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.clientsecrets-module.html#VALID_CLIENT">VALID_CLIENT</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.clientsecrets-module.html">oauth2client.clientsecrets</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file-module.html#validate_file">validate_file()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file-module.html">oauth2client.locked_file</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.crypt.Verifier-class.html#verify">verify()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.crypt.Verifier-class.html">Verifier</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.xsrfutil-module.html#validate_token">validate_token()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.xsrfutil-module.html">oauth2client.xsrfutil</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client-module.html#verify_id_token">verify_id_token()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.appengine.CredentialsProperty-class.html#validate">validate()</a><br />
@@ -1094,6 +1109,13 @@
 <td width="33%" class="link-index"><a href="oauth2client.client.VerifyJwtTokenError-class.html">VerifyJwtTokenError</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 </tr>
+<tr>
+<td width="33%" class="link-index"><a href="oauth2client.locked_file-module.html#validate_file">validate_file()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file-module.html">oauth2client.locked_file</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.crypt.Verifier-class.html#verify">verify()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.crypt.Verifier-class.html">Verifier</a>)</span></td>
+<td width="33%" class="link-index">&nbsp;</td>
+</tr>
 </table>
 </td></tr>
 <tr valign="top"><td valign="top" width="1%"><h2 class="epydoc"><a name="X">X</a></h2></td>
@@ -1116,407 +1138,342 @@
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.http.RequestMockBuilder-class.html#__call__">__call__()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http.RequestMockBuilder-class.html">RequestMockBuilder</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.errors.HttpError-class.html#_get_reason">_get_reason()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.errors.HttpError-class.html">HttpError</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.locked_file.LockedFile-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file.LockedFile-class.html">LockedFile</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_locked_json_read">_locked_json_read()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.mimeparse-module.html#__credits__">__credits__</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.mimeparse-module.html">apiclient.mimeparse</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.mimeparse-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.mimeparse-module.html">apiclient.mimeparse</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_get_storage">_get_storage()</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.locked_file._Opener-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._Opener-class.html" onclick="show_private();">_Opener</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_locked_json_write">_locked_json_write()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="apiclient.mimeparse-module.html#__email__">__email__</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.mimeparse-module.html">apiclient.mimeparse</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.model-module.html">apiclient.model</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_header_to_id">_header_to_id()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#__getstate__">__getstate__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.schema-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.schema-module.html">apiclient.schema</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_id_to_header">_id_to_header()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.errors.BatchError-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.errors.BatchError-class.html">BatchError</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client-module.html">oauth2client</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.crypt-module.html#_json_encode">_json_encode()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.crypt-module.html">oauth2client.crypt</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.errors.HttpError-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.errors.HttpError-class.html">HttpError</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.anyjson-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.anyjson-module.html">oauth2client.anyjson</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.clientsecrets-module.html#_loadfile">_loadfile()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.clientsecrets-module.html">oauth2client.clientsecrets</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.errors.UnexpectedBodyError-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.errors.UnexpectedBodyError-class.html">UnexpectedBodyError</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_lock">_lock()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.errors.UnexpectedMethodError-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.errors.UnexpectedMethodError-class.html">UnexpectedMethodError</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_locked_json_read">_locked_json_read()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.clientsecrets-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.clientsecrets-module.html">oauth2client.clientsecrets</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_locked_json_write">_locked_json_write()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.http.HttpMock-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.HttpMock-class.html">HttpMock</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.crypt-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.crypt-module.html">oauth2client.crypt</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore._Storage-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore._Storage-class.html" onclick="show_private();">_Storage</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.model.BaseModel-class.html#_log_request">_log_request()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model.BaseModel-class.html">BaseModel</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http.HttpMockSequence-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.HttpMockSequence-class.html">HttpMockSequence</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.django_orm-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.django_orm-module.html">oauth2client.django_orm</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#__getstate__">__getstate__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.model.BaseModel-class.html#_log_response">_log_response()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.model.BaseModel-class.html">BaseModel</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http.HttpRequest-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.HttpRequest-class.html">HttpRequest</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.file-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.file-module.html">oauth2client.file</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.errors.BatchError-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.errors.BatchError-class.html">BatchError</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.django_orm.CredentialsField-class.html#__metaclass__">__metaclass__</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.CredentialsField-class.html">CredentialsField</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.discovery-module.html#_media_size_to_long">_media_size_to_long()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http.HttpRequestMock-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.HttpRequestMock-class.html">HttpRequestMock</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.gce-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.gce-module.html">oauth2client.gce</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.errors.HttpError-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.errors.HttpError-class.html">HttpError</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.django_orm.FlowField-class.html#__metaclass__">__metaclass__</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.FlowField-class.html">FlowField</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html">_MultiStore</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file-module.html">oauth2client.multistore_file</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaDownloadProgress-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaDownloadProgress-class.html">MediaDownloadProgress</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.keyring_storage-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.keyring_storage-module.html">oauth2client.keyring_storage</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.errors.UnexpectedBodyError-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.errors.UnexpectedBodyError-class.html">UnexpectedBodyError</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.errors.BatchError-class.html#__repr__">__repr__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.errors.BatchError-class.html">BatchError</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.multistore_file-module.html#_multistores">_multistores</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file-module.html">oauth2client.multistore_file</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaFileUpload-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaFileUpload-class.html">MediaFileUpload</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file-module.html">oauth2client.locked_file</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.errors.UnexpectedMethodError-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.errors.UnexpectedMethodError-class.html">UnexpectedMethodError</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.errors.HttpError-class.html#__repr__">__repr__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.errors.HttpError-class.html">HttpError</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.multistore_file-module.html#_multistores_lock">_multistores_lock</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file-module.html">oauth2client.multistore_file</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaInMemoryUpload-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaInMemoryUpload-class.html">MediaInMemoryUpload</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file-module.html">oauth2client.multistore_file</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#__setstate__">__setstate__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_new_id">_new_id()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseDownload-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaIoBaseDownload-class.html">MediaIoBaseDownload</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.tools-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.tools-module.html">oauth2client.tools</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.HttpMock-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.HttpMock-class.html">HttpMock</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.model-module.html#_abstract">_abstract()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.model-module.html">apiclient.model</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.locked_file._Opener-class.html">_Opener</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.locked_file-module.html">oauth2client.locked_file</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseUpload-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaIoBaseUpload-class.html">MediaIoBaseUpload</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.util-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.util-module.html">oauth2client.util</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.HttpMockSequence-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.HttpMockSequence-class.html">HttpMockSequence</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client-module.html#_abstract">_abstract()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client-module.html#_parse_exchange_token_response">_parse_exchange_token_response()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaUploadProgress-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaUploadProgress-class.html">MediaUploadProgress</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.xsrfutil-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.xsrfutil-module.html">oauth2client.xsrfutil</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.HttpRequest-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.HttpRequest-class.html">HttpRequest</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#_add_query_parameter">_add_query_parameter()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.appengine-module.html#_parse_state_value">_parse_state_value()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http.RequestMockBuilder-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.RequestMockBuilder-class.html">RequestMockBuilder</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.errors.BatchError-class.html#__repr__">__repr__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.errors.BatchError-class.html">BatchError</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.HttpRequestMock-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.HttpRequestMock-class.html">HttpRequestMock</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.model.BaseModel-class.html#_build_query">_build_query()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.model.BaseModel-class.html">BaseModel</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.locked_file._PosixOpener-class.html#_posix_lockfile">_posix_lockfile()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._PosixOpener-class.html" onclick="show_private();">_PosixOpener</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.http._StreamSlice-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http._StreamSlice-class.html" onclick="show_private();">_StreamSlice</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.errors.HttpError-class.html#__repr__">__repr__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.errors.HttpError-class.html">HttpError</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaDownloadProgress-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaDownloadProgress-class.html">MediaDownloadProgress</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine-module.html#_build_state_value">_build_state_value()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.locked_file._PosixOpener-class.html">_PosixOpener</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.locked_file-module.html">oauth2client.locked_file</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.model.JsonModel-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.model.JsonModel-class.html">JsonModel</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#__setstate__">__setstate__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaFileUpload-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaFileUpload-class.html">MediaFileUpload</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client-module.html#_cached_http">_cached_http</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.schema.Schemas-class.html#_prettyPrintByName">_prettyPrintByName()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.schema.Schemas-class.html">Schemas</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.model.ProtocolBufferModel-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.model.ProtocolBufferModel-class.html">ProtocolBufferModel</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model-module.html#_abstract">_abstract()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.model-module.html">apiclient.model</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaInMemoryUpload-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaInMemoryUpload-class.html">MediaInMemoryUpload</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#_cast">_cast()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.schema.Schemas-class.html#_prettyPrintSchema">_prettyPrintSchema()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.schema.Schemas-class.html">Schemas</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.schema.Schemas-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.schema.Schemas-class.html">Schemas</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client-module.html#_abstract">_abstract()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseDownload-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaIoBaseDownload-class.html">MediaIoBaseDownload</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.file.Storage-class.html#_create_file_if_needed">_create_file_if_needed()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.file.Storage-class.html">Storage</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.HttpRequest-class.html#_process_response">_process_response()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http.HttpRequest-class.html">HttpRequest</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="apiclient.schema._SchemaToStruct-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.schema._SchemaToStruct-class.html" onclick="show_private();">_SchemaToStruct</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#_add_query_parameter">_add_query_parameter()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.CredentialsModel-class.html#_properties">_properties</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.CredentialsModel-class.html">CredentialsModel</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.AppAssertionCredentials-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.AppAssertionCredentials-class.html">AppAssertionCredentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.CredentialsModel-class.html#_all_properties">_all_properties</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.CredentialsModel-class.html">CredentialsModel</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.SiteXsrfSecretKey-class.html#_properties">_properties</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.SiteXsrfSecretKey-class.html">SiteXsrfSecretKey</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.SiteXsrfSecretKey-class.html#_all_properties">_all_properties</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.SiteXsrfSecretKey-class.html">SiteXsrfSecretKey</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaIoBaseUpload-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaIoBaseUpload-class.html">MediaIoBaseUpload</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_create_file_if_needed">_create_file_if_needed()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.appengine.AppAssertionCredentials-class.html#_refresh">_refresh()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.appengine.AppAssertionCredentials-class.html">AppAssertionCredentials</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html">OAuth2DecoratorFromClientSecrets</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.model.BaseModel-class.html#_build_query">_build_query()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.model.BaseModel-class.html">BaseModel</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaUploadProgress-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaUploadProgress-class.html">MediaUploadProgress</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#_create_flow">_create_flow()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client.AccessTokenCredentials-class.html#_refresh">_refresh()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.AccessTokenCredentials-class.html">AccessTokenCredentials</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.StorageByKeyName-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.StorageByKeyName-class.html">StorageByKeyName</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine-module.html#_build_state_value">_build_state_value()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.RequestMockBuilder-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.RequestMockBuilder-class.html">RequestMockBuilder</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#_createResource">_createResource()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#_refresh">_refresh()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.client.AccessTokenCredentials-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.AccessTokenCredentials-class.html">AccessTokenCredentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client-module.html#_cached_http">_cached_http</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http._StreamSlice-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http._StreamSlice-class.html" onclick="show_private();">_StreamSlice</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_decode_credential_from_json">_decode_credential_from_json()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
 <td width="33%" class="link-index"><a href="oauth2client.gce.AppAssertionCredentials-class.html#_refresh">_refresh()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.gce.AppAssertionCredentials-class.html">AppAssertionCredentials</a>)</span></td>
 </tr>
 <tr>
-<td width="33%" class="link-index"><a href="oauth2client.client.AssertionCredentials-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.AssertionCredentials-class.html">AssertionCredentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#_cast">_cast()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.model.JsonModel-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.model.JsonModel-class.html">JsonModel</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_delete_credential">_delete_credential()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
 <td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_refresh_and_apply_credentials">_refresh_and_apply_credentials()</a><br />
 <span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
 </tr>
 <tr>
+<td width="33%" class="link-index"><a href="apiclient.model.ProtocolBufferModel-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.model.ProtocolBufferModel-class.html">ProtocolBufferModel</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_deserialize_response">_deserialize_response()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_refresh_data_cache">_refresh_data_cache()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="apiclient.schema.Schemas-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.schema.Schemas-class.html">Schemas</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#_display_error_message">_display_error_message()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.appengine-module.html#_safe_html">_safe_html()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="apiclient.schema._SchemaToStruct-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.schema._SchemaToStruct-class.html" onclick="show_private();">_SchemaToStruct</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#_do_refresh_request">_do_refresh_request()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.schema._SchemaToStruct-class.html">_SchemaToStruct</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.schema-module.html">apiclient.schema</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.AppAssertionCredentials-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.AppAssertionCredentials-class.html">AppAssertionCredentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_execute">_execute()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_serialize_request">_serialize_request()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client-module.html#_extract_id_token">_extract_id_token()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore._Storage-class.html">_Storage</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html">OAuth2DecoratorFromClientSecrets</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.locked_file-module.html#_FcntlOpener">_FcntlOpener</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file-module.html">oauth2client.locked_file</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http._StreamSlice-class.html">_StreamSlice</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="oauth2client.appengine.StorageByKeyName-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.StorageByKeyName-class.html">StorageByKeyName</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.mimeparse-module.html#_filter_blank">_filter_blank()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.mimeparse-module.html">apiclient.mimeparse</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.MediaUpload-class.html#_to_json">_to_json()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaUpload-class.html">MediaUpload</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="oauth2client.client.AccessTokenCredentials-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.AccessTokenCredentials-class.html">AccessTokenCredentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.AssertionCredentials-class.html#_generate_assertion">_generate_assertion()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.AssertionCredentials-class.html">AssertionCredentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.Credentials-class.html#_to_json">_to_json()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.Credentials-class.html">Credentials</a>)</span></td>
+</tr>
+<tr>
+<td width="33%" class="link-index"><a href="oauth2client.client.AssertionCredentials-class.html#__init__">__init__()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.AssertionCredentials-class.html">AssertionCredentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.SignedJwtAssertionCredentials-class.html#_generate_assertion">_generate_assertion()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.SignedJwtAssertionCredentials-class.html">SignedJwtAssertionCredentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.schema._SchemaToStruct-class.html#_to_str_impl">_to_str_impl()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.schema._SchemaToStruct-class.html" onclick="show_private();">_SchemaToStruct</a>)</span></td>
+</tr>
+<tr>
 <td width="33%" class="link-index"><a href="oauth2client.client.MemoryCache-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.MemoryCache-class.html">MemoryCache</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.file.Storage-class.html#_create_file_if_needed">_create_file_if_needed()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.file.Storage-class.html">Storage</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_refresh_data_cache">_refresh_data_cache()</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.appengine-module.html#_generate_new_xsrf_secret_key">_generate_new_xsrf_secret_key()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_unlock">_unlock()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_create_file_if_needed">_create_file_if_needed()</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.client.AssertionCredentials-class.html#_generate_refresh_request_body">_generate_refresh_request_body()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.AssertionCredentials-class.html">AssertionCredentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_update_credential">_update_credential()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine-module.html#_safe_html">_safe_html()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.client.OAuth2WebServerFlow-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2WebServerFlow-class.html">OAuth2WebServerFlow</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#_create_flow">_create_flow()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.schema._SchemaToStruct-class.html">_SchemaToStruct</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.schema-module.html">apiclient.schema</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#_generate_refresh_request_body">_generate_refresh_request_body()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#_updateFromCredential">_updateFromCredential()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.client.SignedJwtAssertionCredentials-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.client.SignedJwtAssertionCredentials-class.html">SignedJwtAssertionCredentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#_createResource">_createResource()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_serialize_request">_serialize_request()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#_generate_refresh_request_headers">_generate_refresh_request_headers()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.client-module.html#_urlsafe_b64decode">_urlsafe_b64decode()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.crypt.Signer-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.crypt.Signer-class.html">Signer</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_decode_credential_from_json">_decode_credential_from_json()</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_get_credential">_get_credential()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore._Storage-class.html">_Storage</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.crypt-module.html#_urlsafe_b64decode">_urlsafe_b64decode()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.crypt-module.html">oauth2client.crypt</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.crypt.Verifier-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.crypt.Verifier-class.html">Verifier</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_delete_credential">_delete_credential()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http._StreamSlice-class.html">_StreamSlice</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http-module.html">apiclient.http</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.errors.HttpError-class.html#_get_reason">_get_reason()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.errors.HttpError-class.html">HttpError</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.crypt-module.html#_urlsafe_b64encode">_urlsafe_b64encode()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.crypt-module.html">oauth2client.crypt</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.django_orm.CredentialsField-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.CredentialsField-class.html">CredentialsField</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_deserialize_response">_deserialize_response()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http.MediaUpload-class.html#_to_json">_to_json()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.MediaUpload-class.html">MediaUpload</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_get_storage">_get_storage()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.clientsecrets-module.html#_validate_clientsecrets">_validate_clientsecrets()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.clientsecrets-module.html">oauth2client.clientsecrets</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.django_orm.FlowField-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.FlowField-class.html">FlowField</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine.OAuth2Decorator-class.html#_display_error_message">_display_error_message()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.Credentials-class.html#_to_json">_to_json()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.Credentials-class.html">Credentials</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_header_to_id">_header_to_id()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.file.Storage-class.html#_validate_file">_validate_file()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.file.Storage-class.html">Storage</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.django_orm.Storage-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.django_orm.Storage-class.html">Storage</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#_do_refresh_request">_do_refresh_request()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.schema._SchemaToStruct-class.html#_to_str_impl">_to_str_impl()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.schema._SchemaToStruct-class.html" onclick="show_private();">_SchemaToStruct</a>)</span></td>
+<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_id_to_header">_id_to_header()</a><br />
+<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.locked_file-module.html#_Win32Opener">_Win32Opener</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file-module.html">oauth2client.locked_file</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.file.Storage-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.file.Storage-class.html">Storage</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.http.BatchHttpRequest-class.html#_execute">_execute()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.http.BatchHttpRequest-class.html">BatchHttpRequest</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_unlock">_unlock()</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.crypt-module.html#_json_encode">_json_encode()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.crypt-module.html">oauth2client.crypt</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_write">_write()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.gce.AppAssertionCredentials-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.gce.AppAssertionCredentials-class.html">AppAssertionCredentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client-module.html#_extract_id_token">_extract_id_token()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_update_credential">_update_credential()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
+<td width="33%" class="link-index"><a href="oauth2client.clientsecrets-module.html#_loadfile">_loadfile()</a><br />
+<span class="index-where">(in&nbsp;<a href="oauth2client.clientsecrets-module.html">oauth2client.clientsecrets</a>)</span></td>
+<td width="33%" class="link-index">&nbsp;</td>
 </tr>
 <tr>
 <td width="33%" class="link-index"><a href="oauth2client.keyring_storage.Storage-class.html#__init__">__init__()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.keyring_storage.Storage-class.html">Storage</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file._FcntlOpener-class.html">_FcntlOpener</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file-module.html">oauth2client.locked_file</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#_updateFromCredential">_updateFromCredential()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file.LockedFile-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file.LockedFile-class.html">LockedFile</a>)</span></td>
-<td width="33%" class="link-index"><a href="apiclient.mimeparse-module.html#_filter_blank">_filter_blank()</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.mimeparse-module.html">apiclient.mimeparse</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client-module.html#_urlsafe_b64decode">_urlsafe_b64decode()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client-module.html">oauth2client.client</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file._Opener-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file._Opener-class.html" onclick="show_private();">_Opener</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.AssertionCredentials-class.html#_generate_assertion">_generate_assertion()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.AssertionCredentials-class.html">AssertionCredentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.crypt-module.html#_urlsafe_b64decode">_urlsafe_b64decode()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.crypt-module.html">oauth2client.crypt</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore._Storage-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore._Storage-class.html" onclick="show_private();">_Storage</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.SignedJwtAssertionCredentials-class.html#_generate_assertion">_generate_assertion()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.SignedJwtAssertionCredentials-class.html">SignedJwtAssertionCredentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.crypt-module.html#_urlsafe_b64encode">_urlsafe_b64encode()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.crypt-module.html">oauth2client.crypt</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#__init__">__init__()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.appengine-module.html#_generate_new_xsrf_secret_key">_generate_new_xsrf_secret_key()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.appengine-module.html">oauth2client.appengine</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.clientsecrets-module.html#_validate_clientsecrets">_validate_clientsecrets()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.clientsecrets-module.html">oauth2client.clientsecrets</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient-module.html">apiclient</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.AssertionCredentials-class.html#_generate_refresh_request_body">_generate_refresh_request_body()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.AssertionCredentials-class.html">AssertionCredentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.file.Storage-class.html#_validate_file">_validate_file()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.file.Storage-class.html">Storage</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.discovery-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.discovery-module.html">apiclient.discovery</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#_generate_refresh_request_body">_generate_refresh_request_body()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.locked_file-module.html#_Win32Opener">_Win32Opener</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.locked_file-module.html">oauth2client.locked_file</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.errors-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.errors-module.html">apiclient.errors</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.client.OAuth2Credentials-class.html#_generate_refresh_request_headers">_generate_refresh_request_headers()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_write">_write()</a><br />
-<span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
-</tr>
-<tr>
-<td width="33%" class="link-index"><a href="apiclient.ext-module.html#__package__">__package__</a><br />
-<span class="index-where">(in&nbsp;<a href="apiclient.ext-module.html">apiclient.ext</a>)</span></td>
-<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_get_credential">_get_credential()</a><br />
+<td width="33%" class="link-index"><a href="oauth2client.multistore_file._MultiStore-class.html#_lock">_lock()</a><br />
 <span class="index-where">(in&nbsp;<a href="oauth2client.multistore_file._MultiStore-class.html" onclick="show_private();">_MultiStore</a>)</span></td>
 <td width="33%" class="link-index">&nbsp;</td>
 </tr>
@@ -1546,7 +1503,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:41 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/mimetools.Message-class.html b/docs/epy/mimetools.Message-class.html
index 69aee48..f974c52 100644
--- a/docs/epy/mimetools.Message-class.html
+++ b/docs/epy/mimetools.Message-class.html
@@ -355,7 +355,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 12:25:02 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/module-tree.html b/docs/epy/module-tree.html
index 91aec2e..35a8ca6 100644
--- a/docs/epy/module-tree.html
+++ b/docs/epy/module-tree.html
@@ -105,7 +105,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:41 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client-module.html b/docs/epy/oauth2client-module.html
index 8d0eb05..87ab6c5 100644
--- a/docs/epy/oauth2client-module.html
+++ b/docs/epy/oauth2client-module.html
@@ -54,7 +54,7 @@
 <h1 class="epydoc">Package oauth2client</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client-pysrc.html">source&nbsp;code</a></span></p>
 <hr />
 <div class="fields">      <p><strong>Version:</strong>
-        1.0c3
+        1.0
       </p>
 </div><!-- ==================== SUBMODULES ==================== -->
 <a name="section-Submodules"></a>
@@ -93,31 +93,6 @@
 </table>
 
 <br />
-<!-- ==================== VARIABLES ==================== -->
-<a name="section-Variables"></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">Variables</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Variables"
-         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">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="None">None</code>
-    </td>
-  </tr>
-</table>
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -141,7 +116,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client-pysrc.html b/docs/epy/oauth2client-pysrc.html
index e6b649b..759ba9d 100644
--- a/docs/epy/oauth2client-pysrc.html
+++ b/docs/epy/oauth2client-pysrc.html
@@ -52,7 +52,7 @@
 </table>
 <h1 class="epydoc">Source Code for <a href="oauth2client-module.html">Package oauth2client</a></h1>
 <pre class="py-src">
-<a name="L1"></a><tt class="py-lineno">1</tt>  <tt class="py-line"><tt class="py-name">__version__</tt> <tt class="py-op">=</tt> <tt class="py-docstring">"1.0c3"</tt> </tt>
+<a name="L1"></a><tt class="py-lineno">1</tt>  <tt class="py-line"><tt class="py-name">__version__</tt> <tt class="py-op">=</tt> <tt class="py-docstring">"1.0"</tt> </tt>
 <a name="L2"></a><tt class="py-lineno">2</tt>  <tt class="py-line"> </tt><script type="text/javascript">
 <!--
 expandto(location.href);
@@ -83,7 +83,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.anyjson-module.html b/docs/epy/oauth2client.anyjson-module.html
index 8c1adaf..f72dfeb 100644
--- a/docs/epy/oauth2client.anyjson-module.html
+++ b/docs/epy/oauth2client.anyjson-module.html
@@ -65,32 +65,7 @@
 <div class="fields">      <p><strong>Author:</strong>
         jcgregorio@google.com (Joe Gregorio)
       </p>
-</div><!-- ==================== VARIABLES ==================== -->
-<a name="section-Variables"></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">Variables</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Variables"
-         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">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
-</table>
-<!-- ==================== NAVIGATION BAR ==================== -->
+</div><!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
   <tr valign="middle">
@@ -113,7 +88,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.anyjson-pysrc.html b/docs/epy/oauth2client.anyjson-pysrc.html
index 2ee08f0..803721b 100644
--- a/docs/epy/oauth2client.anyjson-pysrc.html
+++ b/docs/epy/oauth2client.anyjson-pysrc.html
@@ -115,7 +115,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine-module.html b/docs/epy/oauth2client.appengine-module.html
index 7d26f00..d8ad7a6 100644
--- a/docs/epy/oauth2client.appengine-module.html
+++ b/docs/epy/oauth2client.appengine-module.html
@@ -267,6 +267,26 @@
       
     </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="oauth2client.appengine-module.html#oauth2decorator_from_clientsecrets" class="summary-sig-name">oauth2decorator_from_clientsecrets</a>(<span class="summary-sig-arg">filename</span>,
+        <span class="summary-sig-arg">scope</span>,
+        <span class="summary-sig-arg">message</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">cache</span>=<span class="summary-sig-default">None</span>)</span><br />
+      Creates an OAuth2Decorator populated from a clientsecrets file.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="oauth2client.appengine-pysrc.html#oauth2decorator_from_clientsecrets">source&nbsp;code</a></span>
+            
+          </td>
+        </tr>
+      </table>
+      
+    </td>
+  </tr>
 </table>
 <!-- ==================== VARIABLES ==================== -->
 <a name="section-Variables"></a>
@@ -296,21 +316,14 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="OAUTH2CLIENT_NAMESPACE"></a><span class="summary-name">OAUTH2CLIENT_NAMESPACE</span> = <code title="'oauth2client#ns'"><code class="variable-quote">'</code><code class="variable-string">oauth2client#ns</code><code class="variable-quote">'</code></code>
+        <a name="OAUTH2CLIENT_NAMESPACE"></a><span class="summary-name">OAUTH2CLIENT_NAMESPACE</span> = <code title="'oauth2client#ns'">'oauth2client#ns'</code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="XSRF_MEMCACHE_ID"></a><span class="summary-name">XSRF_MEMCACHE_ID</span> = <code title="'xsrf_secret_key'"><code class="variable-quote">'</code><code class="variable-string">xsrf_secret_key</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
+        <a name="XSRF_MEMCACHE_ID"></a><span class="summary-name">XSRF_MEMCACHE_ID</span> = <code title="'xsrf_secret_key'">'xsrf_secret_key'</code>
     </td>
   </tr>
 </table>
@@ -456,6 +469,48 @@
   </dl>
 </td></tr></table>
 </div>
+<a name="oauth2decorator_from_clientsecrets"></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">oauth2decorator_from_clientsecrets</span>(<span class="sig-arg">filename</span>,
+        <span class="sig-arg">scope</span>,
+        <span class="sig-arg">message</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">cache</span>=<span class="sig-default">None</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="oauth2client.appengine-pysrc.html#oauth2decorator_from_clientsecrets">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+Creates an OAuth2Decorator populated from a clientsecrets file.
+
+Args:
+  filename: string, File name of client secrets.
+  scope: string or list of strings, scope(s) of the credentials being
+    requested.
+  message: string, A friendly string to display to the user if the
+    clientsecrets file is missing or invalid. The message may contain HTML and
+    will be presented on the web interface for any method that uses the
+    decorator.
+  cache: An optional cache service client that implements get() and set()
+    methods. See clientsecrets.loadfile() for details.
+
+Returns: An OAuth2Decorator
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@util.positional(2)</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
 <br />
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
@@ -480,7 +535,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine-pysrc.html b/docs/epy/oauth2client.appengine-pysrc.html
index 37737fa..48432b2 100644
--- a/docs/epy/oauth2client.appengine-pysrc.html
+++ b/docs/epy/oauth2client.appengine-pysrc.html
@@ -284,28 +284,29 @@
 <a name="L170"></a><tt class="py-lineno">170</tt>  <tt class="py-line"><tt class="py-docstring">  oauth2client.Flow"""</tt> </tt>
 <a name="L171"></a><tt class="py-lineno">171</tt>  <tt class="py-line"> </tt>
 <a name="L172"></a><tt class="py-lineno">172</tt>  <tt class="py-line">  <tt class="py-comment"># Tell what the user type is.</tt> </tt>
-<a name="L173"></a><tt class="py-lineno">173</tt>  <tt class="py-line">  <tt class="py-name">data_type</tt> <tt class="py-op">=</tt> <tt id="link-72" class="py-name"><a title="oauth2client.client.Flow" class="py-name" href="#" onclick="return doclink('link-72', 'Flow', 'link-32');">Flow</a></tt> </tt>
+<a name="L173"></a><tt class="py-lineno">173</tt>  <tt class="py-line">  <tt id="link-72" class="py-name" targets="Variable oauth2client.appengine.CredentialsProperty.data_type=oauth2client.appengine.CredentialsProperty-class.html#data_type,Variable oauth2client.appengine.FlowProperty.data_type=oauth2client.appengine.FlowProperty-class.html#data_type"><a title="oauth2client.appengine.CredentialsProperty.data_type
+oauth2client.appengine.FlowProperty.data_type" class="py-name" href="#" onclick="return doclink('link-72', 'data_type', 'link-72');">data_type</a></tt> <tt class="py-op">=</tt> <tt id="link-73" class="py-name"><a title="oauth2client.client.Flow" class="py-name" href="#" onclick="return doclink('link-73', 'Flow', 'link-32');">Flow</a></tt> </tt>
 <a name="L174"></a><tt class="py-lineno">174</tt>  <tt class="py-line"> </tt>
 <a name="L175"></a><tt class="py-lineno">175</tt>  <tt class="py-line">  <tt class="py-comment"># For writing to datastore.</tt> </tt>
 <a name="FlowProperty.get_value_for_datastore"></a><div id="FlowProperty.get_value_for_datastore-def"><a name="L176"></a><tt class="py-lineno">176</tt> <a class="py-toggle" href="#" id="FlowProperty.get_value_for_datastore-toggle" onclick="return toggle('FlowProperty.get_value_for_datastore');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.FlowProperty-class.html#get_value_for_datastore">get_value_for_datastore</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">model_instance</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-</div><div id="FlowProperty.get_value_for_datastore-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="FlowProperty.get_value_for_datastore-expanded"><a name="L177"></a><tt class="py-lineno">177</tt>  <tt class="py-line">    <tt class="py-name">flow</tt> <tt class="py-op">=</tt> <tt class="py-name">super</tt><tt class="py-op">(</tt><tt id="link-73" class="py-name" targets="Class oauth2client.appengine.FlowProperty=oauth2client.appengine.FlowProperty-class.html"><a title="oauth2client.appengine.FlowProperty" class="py-name" href="#" onclick="return doclink('link-73', 'FlowProperty', 'link-73');">FlowProperty</a></tt><tt class="py-op">,</tt> </tt>
-<a name="L178"></a><tt class="py-lineno">178</tt>  <tt class="py-line">                 <tt class="py-name">self</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-74" class="py-name" targets="Method oauth2client.appengine.CredentialsProperty.get_value_for_datastore()=oauth2client.appengine.CredentialsProperty-class.html#get_value_for_datastore,Method oauth2client.appengine.FlowProperty.get_value_for_datastore()=oauth2client.appengine.FlowProperty-class.html#get_value_for_datastore"><a title="oauth2client.appengine.CredentialsProperty.get_value_for_datastore
-oauth2client.appengine.FlowProperty.get_value_for_datastore" class="py-name" href="#" onclick="return doclink('link-74', 'get_value_for_datastore', 'link-74');">get_value_for_datastore</a></tt><tt class="py-op">(</tt><tt class="py-name">model_instance</tt><tt class="py-op">)</tt> </tt>
+</div><div id="FlowProperty.get_value_for_datastore-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="FlowProperty.get_value_for_datastore-expanded"><a name="L177"></a><tt class="py-lineno">177</tt>  <tt class="py-line">    <tt class="py-name">flow</tt> <tt class="py-op">=</tt> <tt class="py-name">super</tt><tt class="py-op">(</tt><tt id="link-74" class="py-name" targets="Class oauth2client.appengine.FlowProperty=oauth2client.appengine.FlowProperty-class.html"><a title="oauth2client.appengine.FlowProperty" class="py-name" href="#" onclick="return doclink('link-74', 'FlowProperty', 'link-74');">FlowProperty</a></tt><tt class="py-op">,</tt> </tt>
+<a name="L178"></a><tt class="py-lineno">178</tt>  <tt class="py-line">                 <tt class="py-name">self</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-75" class="py-name" targets="Method oauth2client.appengine.CredentialsProperty.get_value_for_datastore()=oauth2client.appengine.CredentialsProperty-class.html#get_value_for_datastore,Method oauth2client.appengine.FlowProperty.get_value_for_datastore()=oauth2client.appengine.FlowProperty-class.html#get_value_for_datastore"><a title="oauth2client.appengine.CredentialsProperty.get_value_for_datastore
+oauth2client.appengine.FlowProperty.get_value_for_datastore" class="py-name" href="#" onclick="return doclink('link-75', 'get_value_for_datastore', 'link-75');">get_value_for_datastore</a></tt><tt class="py-op">(</tt><tt class="py-name">model_instance</tt><tt class="py-op">)</tt> </tt>
 <a name="L179"></a><tt class="py-lineno">179</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">db</tt><tt class="py-op">.</tt><tt class="py-name">Blob</tt><tt class="py-op">(</tt><tt class="py-name">pickle</tt><tt class="py-op">.</tt><tt class="py-name">dumps</tt><tt class="py-op">(</tt><tt class="py-name">flow</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L180"></a><tt class="py-lineno">180</tt>  <tt class="py-line"> </tt>
 <a name="L181"></a><tt class="py-lineno">181</tt>  <tt class="py-line">  <tt class="py-comment"># For reading from datastore.</tt> </tt>
 <a name="FlowProperty.make_value_from_datastore"></a><div id="FlowProperty.make_value_from_datastore-def"><a name="L182"></a><tt class="py-lineno">182</tt> <a class="py-toggle" href="#" id="FlowProperty.make_value_from_datastore-toggle" onclick="return toggle('FlowProperty.make_value_from_datastore');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.FlowProperty-class.html#make_value_from_datastore">make_value_from_datastore</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">value</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="FlowProperty.make_value_from_datastore-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="FlowProperty.make_value_from_datastore-expanded"><a name="L183"></a><tt class="py-lineno">183</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">value</tt> <tt class="py-keyword">is</tt> <tt class="py-name">None</tt><tt class="py-op">:</tt> </tt>
 <a name="L184"></a><tt class="py-lineno">184</tt>  <tt class="py-line">      <tt class="py-keyword">return</tt> <tt class="py-name">None</tt> </tt>
-<a name="L185"></a><tt class="py-lineno">185</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">pickle</tt><tt class="py-op">.</tt><tt id="link-75" class="py-name"><a title="oauth2client.clientsecrets.loads" class="py-name" href="#" onclick="return doclink('link-75', 'loads', 'link-68');">loads</a></tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt> </tt>
+<a name="L185"></a><tt class="py-lineno">185</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">pickle</tt><tt class="py-op">.</tt><tt id="link-76" class="py-name"><a title="oauth2client.clientsecrets.loads" class="py-name" href="#" onclick="return doclink('link-76', 'loads', 'link-68');">loads</a></tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L186"></a><tt class="py-lineno">186</tt>  <tt class="py-line"> </tt>
 <a name="FlowProperty.validate"></a><div id="FlowProperty.validate-def"><a name="L187"></a><tt class="py-lineno">187</tt> <a class="py-toggle" href="#" id="FlowProperty.validate-toggle" onclick="return toggle('FlowProperty.validate');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.FlowProperty-class.html#validate">validate</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">value</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-</div><div id="FlowProperty.validate-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="FlowProperty.validate-expanded"><a name="L188"></a><tt class="py-lineno">188</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">value</tt> <tt class="py-keyword">is</tt> <tt class="py-keyword">not</tt> <tt class="py-name">None</tt> <tt class="py-keyword">and</tt> <tt class="py-keyword">not</tt> <tt class="py-name">isinstance</tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">,</tt> <tt id="link-76" class="py-name"><a title="oauth2client.client.Flow" class="py-name" href="#" onclick="return doclink('link-76', 'Flow', 'link-32');">Flow</a></tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
+</div><div id="FlowProperty.validate-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="FlowProperty.validate-expanded"><a name="L188"></a><tt class="py-lineno">188</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">value</tt> <tt class="py-keyword">is</tt> <tt class="py-keyword">not</tt> <tt class="py-name">None</tt> <tt class="py-keyword">and</tt> <tt class="py-keyword">not</tt> <tt class="py-name">isinstance</tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">,</tt> <tt id="link-77" class="py-name"><a title="oauth2client.client.Flow" class="py-name" href="#" onclick="return doclink('link-77', 'Flow', 'link-32');">Flow</a></tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 <a name="L189"></a><tt class="py-lineno">189</tt>  <tt class="py-line">      <tt class="py-keyword">raise</tt> <tt class="py-name">db</tt><tt class="py-op">.</tt><tt class="py-name">BadValueError</tt><tt class="py-op">(</tt><tt class="py-string">'Property %s must be convertible '</tt> </tt>
 <a name="L190"></a><tt class="py-lineno">190</tt>  <tt class="py-line">                          <tt class="py-string">'to a FlowThreeLegged instance (%s)'</tt> <tt class="py-op">%</tt> </tt>
 <a name="L191"></a><tt class="py-lineno">191</tt>  <tt class="py-line">                          <tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">name</tt><tt class="py-op">,</tt> <tt class="py-name">value</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
-<a name="L192"></a><tt class="py-lineno">192</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">super</tt><tt class="py-op">(</tt><tt id="link-77" class="py-name"><a title="oauth2client.appengine.FlowProperty" class="py-name" href="#" onclick="return doclink('link-77', 'FlowProperty', 'link-73');">FlowProperty</a></tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-78" class="py-name" targets="Method oauth2client.appengine.CredentialsProperty.validate()=oauth2client.appengine.CredentialsProperty-class.html#validate,Method oauth2client.appengine.FlowProperty.validate()=oauth2client.appengine.FlowProperty-class.html#validate"><a title="oauth2client.appengine.CredentialsProperty.validate
-oauth2client.appengine.FlowProperty.validate" class="py-name" href="#" onclick="return doclink('link-78', 'validate', 'link-78');">validate</a></tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt> </tt>
+<a name="L192"></a><tt class="py-lineno">192</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">super</tt><tt class="py-op">(</tt><tt id="link-78" class="py-name"><a title="oauth2client.appengine.FlowProperty" class="py-name" href="#" onclick="return doclink('link-78', 'FlowProperty', 'link-74');">FlowProperty</a></tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-79" class="py-name" targets="Method oauth2client.appengine.CredentialsProperty.validate()=oauth2client.appengine.CredentialsProperty-class.html#validate,Method oauth2client.appengine.FlowProperty.validate()=oauth2client.appengine.FlowProperty-class.html#validate"><a title="oauth2client.appengine.CredentialsProperty.validate
+oauth2client.appengine.FlowProperty.validate" class="py-name" href="#" onclick="return doclink('link-79', 'validate', 'link-79');">validate</a></tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L193"></a><tt class="py-lineno">193</tt>  <tt class="py-line"> </tt>
 <a name="FlowProperty.empty"></a><div id="FlowProperty.empty-def"><a name="L194"></a><tt class="py-lineno">194</tt> <a class="py-toggle" href="#" id="FlowProperty.empty-toggle" onclick="return toggle('FlowProperty.empty');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.FlowProperty-class.html#empty">empty</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">value</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="FlowProperty.empty-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="FlowProperty.empty-expanded"><a name="L195"></a><tt class="py-lineno">195</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-keyword">not</tt> <tt class="py-name">value</tt> </tt>
@@ -319,65 +320,66 @@
 <a name="L203"></a><tt class="py-lineno">203</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
 <a name="L204"></a><tt class="py-lineno">204</tt>  <tt class="py-line"> </tt>
 <a name="L205"></a><tt class="py-lineno">205</tt>  <tt class="py-line">  <tt class="py-comment"># Tell what the user type is.</tt> </tt>
-<a name="L206"></a><tt class="py-lineno">206</tt>  <tt class="py-line">  <tt class="py-name">data_type</tt> <tt class="py-op">=</tt> <tt id="link-79" class="py-name"><a title="oauth2client.client.Credentials" class="py-name" href="#" onclick="return doclink('link-79', 'Credentials', 'link-29');">Credentials</a></tt> </tt>
+<a name="L206"></a><tt class="py-lineno">206</tt>  <tt class="py-line">  <tt id="link-80" class="py-name"><a title="oauth2client.appengine.CredentialsProperty.data_type
+oauth2client.appengine.FlowProperty.data_type" class="py-name" href="#" onclick="return doclink('link-80', 'data_type', 'link-72');">data_type</a></tt> <tt class="py-op">=</tt> <tt id="link-81" class="py-name"><a title="oauth2client.client.Credentials" class="py-name" href="#" onclick="return doclink('link-81', 'Credentials', 'link-29');">Credentials</a></tt> </tt>
 <a name="L207"></a><tt class="py-lineno">207</tt>  <tt class="py-line"> </tt>
 <a name="L208"></a><tt class="py-lineno">208</tt>  <tt class="py-line">  <tt class="py-comment"># For writing to datastore.</tt> </tt>
 <a name="CredentialsProperty.get_value_for_datastore"></a><div id="CredentialsProperty.get_value_for_datastore-def"><a name="L209"></a><tt class="py-lineno">209</tt> <a class="py-toggle" href="#" id="CredentialsProperty.get_value_for_datastore-toggle" onclick="return toggle('CredentialsProperty.get_value_for_datastore');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.CredentialsProperty-class.html#get_value_for_datastore">get_value_for_datastore</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">model_instance</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-</div><div id="CredentialsProperty.get_value_for_datastore-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="CredentialsProperty.get_value_for_datastore-expanded"><a name="L210"></a><tt class="py-lineno">210</tt>  <tt class="py-line">    <tt id="link-80" class="py-name"><a title="apiclient.discovery.logger
+</div><div id="CredentialsProperty.get_value_for_datastore-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="CredentialsProperty.get_value_for_datastore-expanded"><a name="L210"></a><tt class="py-lineno">210</tt>  <tt class="py-line">    <tt id="link-82" class="py-name"><a title="apiclient.discovery.logger
 oauth2client.appengine.logger
 oauth2client.client.logger
 oauth2client.crypt.logger
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-80', 'logger', 'link-39');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">"get: Got type "</tt> <tt class="py-op">+</tt> <tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">type</tt><tt class="py-op">(</tt><tt class="py-name">model_instance</tt><tt class="py-op">)</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
-<a name="L211"></a><tt class="py-lineno">211</tt>  <tt class="py-line">    <tt class="py-name">cred</tt> <tt class="py-op">=</tt> <tt class="py-name">super</tt><tt class="py-op">(</tt><tt id="link-81" class="py-name" targets="Class oauth2client.appengine.CredentialsProperty=oauth2client.appengine.CredentialsProperty-class.html"><a title="oauth2client.appengine.CredentialsProperty" class="py-name" href="#" onclick="return doclink('link-81', 'CredentialsProperty', 'link-81');">CredentialsProperty</a></tt><tt class="py-op">,</tt> </tt>
-<a name="L212"></a><tt class="py-lineno">212</tt>  <tt class="py-line">                 <tt class="py-name">self</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-82" class="py-name"><a title="oauth2client.appengine.CredentialsProperty.get_value_for_datastore
-oauth2client.appengine.FlowProperty.get_value_for_datastore" class="py-name" href="#" onclick="return doclink('link-82', 'get_value_for_datastore', 'link-74');">get_value_for_datastore</a></tt><tt class="py-op">(</tt><tt class="py-name">model_instance</tt><tt class="py-op">)</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-82', 'logger', 'link-39');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">"get: Got type "</tt> <tt class="py-op">+</tt> <tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">type</tt><tt class="py-op">(</tt><tt class="py-name">model_instance</tt><tt class="py-op">)</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+<a name="L211"></a><tt class="py-lineno">211</tt>  <tt class="py-line">    <tt class="py-name">cred</tt> <tt class="py-op">=</tt> <tt class="py-name">super</tt><tt class="py-op">(</tt><tt id="link-83" class="py-name" targets="Class oauth2client.appengine.CredentialsProperty=oauth2client.appengine.CredentialsProperty-class.html"><a title="oauth2client.appengine.CredentialsProperty" class="py-name" href="#" onclick="return doclink('link-83', 'CredentialsProperty', 'link-83');">CredentialsProperty</a></tt><tt class="py-op">,</tt> </tt>
+<a name="L212"></a><tt class="py-lineno">212</tt>  <tt class="py-line">                 <tt class="py-name">self</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-84" class="py-name"><a title="oauth2client.appengine.CredentialsProperty.get_value_for_datastore
+oauth2client.appengine.FlowProperty.get_value_for_datastore" class="py-name" href="#" onclick="return doclink('link-84', 'get_value_for_datastore', 'link-75');">get_value_for_datastore</a></tt><tt class="py-op">(</tt><tt class="py-name">model_instance</tt><tt class="py-op">)</tt> </tt>
 <a name="L213"></a><tt class="py-lineno">213</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">cred</tt> <tt class="py-keyword">is</tt> <tt class="py-name">None</tt><tt class="py-op">:</tt> </tt>
 <a name="L214"></a><tt class="py-lineno">214</tt>  <tt class="py-line">      <tt class="py-name">cred</tt> <tt class="py-op">=</tt> <tt class="py-string">''</tt> </tt>
 <a name="L215"></a><tt class="py-lineno">215</tt>  <tt class="py-line">    <tt class="py-keyword">else</tt><tt class="py-op">:</tt> </tt>
-<a name="L216"></a><tt class="py-lineno">216</tt>  <tt class="py-line">      <tt class="py-name">cred</tt> <tt class="py-op">=</tt> <tt class="py-name">cred</tt><tt class="py-op">.</tt><tt id="link-83" class="py-name" targets="Method apiclient.http.HttpRequest.to_json()=apiclient.http.HttpRequest-class.html#to_json,Method apiclient.http.MediaFileUpload.to_json()=apiclient.http.MediaFileUpload-class.html#to_json,Method apiclient.http.MediaIoBaseUpload.to_json()=apiclient.http.MediaIoBaseUpload-class.html#to_json,Method apiclient.http.MediaUpload.to_json()=apiclient.http.MediaUpload-class.html#to_json,Method oauth2client.client.Credentials.to_json()=oauth2client.client.Credentials-class.html#to_json,Method oauth2client.client.OAuth2Credentials.to_json()=oauth2client.client.OAuth2Credentials-class.html#to_json"><a title="apiclient.http.HttpRequest.to_json
+<a name="L216"></a><tt class="py-lineno">216</tt>  <tt class="py-line">      <tt class="py-name">cred</tt> <tt class="py-op">=</tt> <tt class="py-name">cred</tt><tt class="py-op">.</tt><tt id="link-85" class="py-name" targets="Method apiclient.http.HttpRequest.to_json()=apiclient.http.HttpRequest-class.html#to_json,Method apiclient.http.MediaFileUpload.to_json()=apiclient.http.MediaFileUpload-class.html#to_json,Method apiclient.http.MediaIoBaseUpload.to_json()=apiclient.http.MediaIoBaseUpload-class.html#to_json,Method apiclient.http.MediaUpload.to_json()=apiclient.http.MediaUpload-class.html#to_json,Method oauth2client.client.Credentials.to_json()=oauth2client.client.Credentials-class.html#to_json,Method oauth2client.client.OAuth2Credentials.to_json()=oauth2client.client.OAuth2Credentials-class.html#to_json"><a title="apiclient.http.HttpRequest.to_json
 apiclient.http.MediaFileUpload.to_json
 apiclient.http.MediaIoBaseUpload.to_json
 apiclient.http.MediaUpload.to_json
 oauth2client.client.Credentials.to_json
-oauth2client.client.OAuth2Credentials.to_json" class="py-name" href="#" onclick="return doclink('link-83', 'to_json', 'link-83');">to_json</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
+oauth2client.client.OAuth2Credentials.to_json" class="py-name" href="#" onclick="return doclink('link-85', 'to_json', 'link-85');">to_json</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L217"></a><tt class="py-lineno">217</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">db</tt><tt class="py-op">.</tt><tt class="py-name">Blob</tt><tt class="py-op">(</tt><tt class="py-name">cred</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L218"></a><tt class="py-lineno">218</tt>  <tt class="py-line"> </tt>
 <a name="L219"></a><tt class="py-lineno">219</tt>  <tt class="py-line">  <tt class="py-comment"># For reading from datastore.</tt> </tt>
 <a name="CredentialsProperty.make_value_from_datastore"></a><div id="CredentialsProperty.make_value_from_datastore-def"><a name="L220"></a><tt class="py-lineno">220</tt> <a class="py-toggle" href="#" id="CredentialsProperty.make_value_from_datastore-toggle" onclick="return toggle('CredentialsProperty.make_value_from_datastore');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.CredentialsProperty-class.html#make_value_from_datastore">make_value_from_datastore</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">value</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-</div><div id="CredentialsProperty.make_value_from_datastore-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="CredentialsProperty.make_value_from_datastore-expanded"><a name="L221"></a><tt class="py-lineno">221</tt>  <tt class="py-line">    <tt id="link-84" class="py-name"><a title="apiclient.discovery.logger
+</div><div id="CredentialsProperty.make_value_from_datastore-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="CredentialsProperty.make_value_from_datastore-expanded"><a name="L221"></a><tt class="py-lineno">221</tt>  <tt class="py-line">    <tt id="link-86" class="py-name"><a title="apiclient.discovery.logger
 oauth2client.appengine.logger
 oauth2client.client.logger
 oauth2client.crypt.logger
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-84', 'logger', 'link-39');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">"make: Got type "</tt> <tt class="py-op">+</tt> <tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">type</tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-86', 'logger', 'link-39');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">"make: Got type "</tt> <tt class="py-op">+</tt> <tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">type</tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L222"></a><tt class="py-lineno">222</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">value</tt> <tt class="py-keyword">is</tt> <tt class="py-name">None</tt><tt class="py-op">:</tt> </tt>
 <a name="L223"></a><tt class="py-lineno">223</tt>  <tt class="py-line">      <tt class="py-keyword">return</tt> <tt class="py-name">None</tt> </tt>
 <a name="L224"></a><tt class="py-lineno">224</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">len</tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt> <tt class="py-op">==</tt> <tt class="py-number">0</tt><tt class="py-op">:</tt> </tt>
 <a name="L225"></a><tt class="py-lineno">225</tt>  <tt class="py-line">      <tt class="py-keyword">return</tt> <tt class="py-name">None</tt> </tt>
 <a name="L226"></a><tt class="py-lineno">226</tt>  <tt class="py-line">    <tt class="py-keyword">try</tt><tt class="py-op">:</tt> </tt>
-<a name="L227"></a><tt class="py-lineno">227</tt>  <tt class="py-line">      <tt id="link-85" class="py-name" targets="Variable oauth2client.appengine.CredentialsModel.credentials=oauth2client.appengine.CredentialsModel-class.html#credentials"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-85', 'credentials', 'link-85');">credentials</a></tt> <tt class="py-op">=</tt> <tt id="link-86" class="py-name"><a title="oauth2client.client.Credentials" class="py-name" href="#" onclick="return doclink('link-86', 'Credentials', 'link-29');">Credentials</a></tt><tt class="py-op">.</tt><tt id="link-87" class="py-name" targets="Class Method apiclient.http.MediaUpload.new_from_json()=apiclient.http.MediaUpload-class.html#new_from_json,Class Method oauth2client.client.Credentials.new_from_json()=oauth2client.client.Credentials-class.html#new_from_json"><a title="apiclient.http.MediaUpload.new_from_json
-oauth2client.client.Credentials.new_from_json" class="py-name" href="#" onclick="return doclink('link-87', 'new_from_json', 'link-87');">new_from_json</a></tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt> </tt>
+<a name="L227"></a><tt class="py-lineno">227</tt>  <tt class="py-line">      <tt id="link-87" class="py-name" targets="Variable oauth2client.appengine.CredentialsModel.credentials=oauth2client.appengine.CredentialsModel-class.html#credentials"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-87', 'credentials', 'link-87');">credentials</a></tt> <tt class="py-op">=</tt> <tt id="link-88" class="py-name"><a title="oauth2client.client.Credentials" class="py-name" href="#" onclick="return doclink('link-88', 'Credentials', 'link-29');">Credentials</a></tt><tt class="py-op">.</tt><tt id="link-89" class="py-name" targets="Class Method apiclient.http.MediaUpload.new_from_json()=apiclient.http.MediaUpload-class.html#new_from_json,Class Method oauth2client.client.Credentials.new_from_json()=oauth2client.client.Credentials-class.html#new_from_json"><a title="apiclient.http.MediaUpload.new_from_json
+oauth2client.client.Credentials.new_from_json" class="py-name" href="#" onclick="return doclink('link-89', 'new_from_json', 'link-89');">new_from_json</a></tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt> </tt>
 <a name="L228"></a><tt class="py-lineno">228</tt>  <tt class="py-line">    <tt class="py-keyword">except</tt> <tt class="py-name">ValueError</tt><tt class="py-op">:</tt> </tt>
-<a name="L229"></a><tt class="py-lineno">229</tt>  <tt class="py-line">      <tt id="link-88" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-88', 'credentials', 'link-85');">credentials</a></tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
-<a name="L230"></a><tt class="py-lineno">230</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt id="link-89" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-89', 'credentials', 'link-85');">credentials</a></tt> </tt>
+<a name="L229"></a><tt class="py-lineno">229</tt>  <tt class="py-line">      <tt id="link-90" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-90', 'credentials', 'link-87');">credentials</a></tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
+<a name="L230"></a><tt class="py-lineno">230</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt id="link-91" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-91', 'credentials', 'link-87');">credentials</a></tt> </tt>
 </div><a name="L231"></a><tt class="py-lineno">231</tt>  <tt class="py-line"> </tt>
 <a name="CredentialsProperty.validate"></a><div id="CredentialsProperty.validate-def"><a name="L232"></a><tt class="py-lineno">232</tt> <a class="py-toggle" href="#" id="CredentialsProperty.validate-toggle" onclick="return toggle('CredentialsProperty.validate');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.CredentialsProperty-class.html#validate">validate</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">value</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-</div><div id="CredentialsProperty.validate-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="CredentialsProperty.validate-expanded"><a name="L233"></a><tt class="py-lineno">233</tt>  <tt class="py-line">    <tt class="py-name">value</tt> <tt class="py-op">=</tt> <tt class="py-name">super</tt><tt class="py-op">(</tt><tt id="link-90" class="py-name"><a title="oauth2client.appengine.CredentialsProperty" class="py-name" href="#" onclick="return doclink('link-90', 'CredentialsProperty', 'link-81');">CredentialsProperty</a></tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-91" class="py-name"><a title="oauth2client.appengine.CredentialsProperty.validate
-oauth2client.appengine.FlowProperty.validate" class="py-name" href="#" onclick="return doclink('link-91', 'validate', 'link-78');">validate</a></tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt> </tt>
-<a name="L234"></a><tt class="py-lineno">234</tt>  <tt class="py-line">    <tt id="link-92" class="py-name"><a title="apiclient.discovery.logger
+</div><div id="CredentialsProperty.validate-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="CredentialsProperty.validate-expanded"><a name="L233"></a><tt class="py-lineno">233</tt>  <tt class="py-line">    <tt class="py-name">value</tt> <tt class="py-op">=</tt> <tt class="py-name">super</tt><tt class="py-op">(</tt><tt id="link-92" class="py-name"><a title="oauth2client.appengine.CredentialsProperty" class="py-name" href="#" onclick="return doclink('link-92', 'CredentialsProperty', 'link-83');">CredentialsProperty</a></tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-93" class="py-name"><a title="oauth2client.appengine.CredentialsProperty.validate
+oauth2client.appengine.FlowProperty.validate" class="py-name" href="#" onclick="return doclink('link-93', 'validate', 'link-79');">validate</a></tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt> </tt>
+<a name="L234"></a><tt class="py-lineno">234</tt>  <tt class="py-line">    <tt id="link-94" class="py-name"><a title="apiclient.discovery.logger
 oauth2client.appengine.logger
 oauth2client.client.logger
 oauth2client.crypt.logger
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-92', 'logger', 'link-39');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">"validate: Got type "</tt> <tt class="py-op">+</tt> <tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">type</tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
-<a name="L235"></a><tt class="py-lineno">235</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">value</tt> <tt class="py-keyword">is</tt> <tt class="py-keyword">not</tt> <tt class="py-name">None</tt> <tt class="py-keyword">and</tt> <tt class="py-keyword">not</tt> <tt class="py-name">isinstance</tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">,</tt> <tt id="link-93" class="py-name"><a title="oauth2client.client.Credentials" class="py-name" href="#" onclick="return doclink('link-93', 'Credentials', 'link-29');">Credentials</a></tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-94', 'logger', 'link-39');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">"validate: Got type "</tt> <tt class="py-op">+</tt> <tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">type</tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">)</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+<a name="L235"></a><tt class="py-lineno">235</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">value</tt> <tt class="py-keyword">is</tt> <tt class="py-keyword">not</tt> <tt class="py-name">None</tt> <tt class="py-keyword">and</tt> <tt class="py-keyword">not</tt> <tt class="py-name">isinstance</tt><tt class="py-op">(</tt><tt class="py-name">value</tt><tt class="py-op">,</tt> <tt id="link-95" class="py-name"><a title="oauth2client.client.Credentials" class="py-name" href="#" onclick="return doclink('link-95', 'Credentials', 'link-29');">Credentials</a></tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 <a name="L236"></a><tt class="py-lineno">236</tt>  <tt class="py-line">      <tt class="py-keyword">raise</tt> <tt class="py-name">db</tt><tt class="py-op">.</tt><tt class="py-name">BadValueError</tt><tt class="py-op">(</tt><tt class="py-string">'Property %s must be convertible '</tt> </tt>
 <a name="L237"></a><tt class="py-lineno">237</tt>  <tt class="py-line">                          <tt class="py-string">'to a Credentials instance (%s)'</tt> <tt class="py-op">%</tt> </tt>
 <a name="L238"></a><tt class="py-lineno">238</tt>  <tt class="py-line">                            <tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">name</tt><tt class="py-op">,</tt> <tt class="py-name">value</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
@@ -396,7 +398,7 @@
 <a name="L251"></a><tt class="py-lineno">251</tt>  <tt class="py-line"><tt class="py-docstring">  are stored by key_name.</tt> </tt>
 <a name="L252"></a><tt class="py-lineno">252</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
 <a name="L253"></a><tt class="py-lineno">253</tt>  <tt class="py-line"> </tt>
-<a name="L254"></a><tt class="py-lineno">254</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-94" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-94', 'positional', 'link-65');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">4</tt><tt class="py-op">)</tt> </tt>
+<a name="L254"></a><tt class="py-lineno">254</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-96" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-96', 'positional', 'link-65');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">4</tt><tt class="py-op">)</tt> </tt>
 <a name="StorageByKeyName.__init__"></a><div id="StorageByKeyName.__init__-def"><a name="L255"></a><tt class="py-lineno">255</tt> <a class="py-toggle" href="#" id="StorageByKeyName.__init__-toggle" onclick="return toggle('StorageByKeyName.__init__');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.StorageByKeyName-class.html#__init__">__init__</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">model</tt><tt class="py-op">,</tt> <tt class="py-param">key_name</tt><tt class="py-op">,</tt> <tt class="py-param">property_name</tt><tt class="py-op">,</tt> <tt class="py-param">cache</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="StorageByKeyName.__init__-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="StorageByKeyName.__init__-expanded"><a name="L256"></a><tt class="py-lineno">256</tt>  <tt class="py-line">    <tt class="py-docstring">"""Constructor for Storage.</tt> </tt>
 <a name="L257"></a><tt class="py-lineno">257</tt>  <tt class="py-line"><tt class="py-docstring"></tt> </tt>
@@ -406,7 +408,7 @@
 <a name="L261"></a><tt class="py-lineno">261</tt>  <tt class="py-line"><tt class="py-docstring">      property_name: string, name of the property that is a CredentialsProperty</tt> </tt>
 <a name="L262"></a><tt class="py-lineno">262</tt>  <tt class="py-line"><tt class="py-docstring">      cache: memcache, a write-through cache to put in front of the datastore</tt> </tt>
 <a name="L263"></a><tt class="py-lineno">263</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
-<a name="L264"></a><tt class="py-lineno">264</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_model</tt> <tt class="py-op">=</tt> <tt id="link-95" class="py-name"><a title="apiclient.model" class="py-name" href="#" onclick="return doclink('link-95', 'model', 'link-48');">model</a></tt> </tt>
+<a name="L264"></a><tt class="py-lineno">264</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_model</tt> <tt class="py-op">=</tt> <tt id="link-97" class="py-name"><a title="apiclient.model" class="py-name" href="#" onclick="return doclink('link-97', 'model', 'link-48');">model</a></tt> </tt>
 <a name="L265"></a><tt class="py-lineno">265</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt> <tt class="py-op">=</tt> <tt class="py-name">key_name</tt> </tt>
 <a name="L266"></a><tt class="py-lineno">266</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_property_name</tt> <tt class="py-op">=</tt> <tt class="py-name">property_name</tt> </tt>
 <a name="L267"></a><tt class="py-lineno">267</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt> <tt class="py-op">=</tt> <tt class="py-name">cache</tt> </tt>
@@ -418,26 +420,26 @@
 <a name="L273"></a><tt class="py-lineno">273</tt>  <tt class="py-line"><tt class="py-docstring">      oauth2client.Credentials</tt> </tt>
 <a name="L274"></a><tt class="py-lineno">274</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
 <a name="L275"></a><tt class="py-lineno">275</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">:</tt> </tt>
-<a name="L276"></a><tt class="py-lineno">276</tt>  <tt class="py-line">      <tt class="py-name">json</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">.</tt><tt id="link-96" class="py-name"><a title="apiclient.schema.Schemas.get
+<a name="L276"></a><tt class="py-lineno">276</tt>  <tt class="py-line">      <tt class="py-name">json</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">.</tt><tt id="link-98" class="py-name"><a title="apiclient.schema.Schemas.get
 oauth2client.client.MemoryCache.get
-oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-96', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">)</tt> </tt>
+oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-98', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">)</tt> </tt>
 <a name="L277"></a><tt class="py-lineno">277</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-name">json</tt><tt class="py-op">:</tt> </tt>
-<a name="L278"></a><tt class="py-lineno">278</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt id="link-97" class="py-name"><a title="oauth2client.client.Credentials" class="py-name" href="#" onclick="return doclink('link-97', 'Credentials', 'link-29');">Credentials</a></tt><tt class="py-op">.</tt><tt id="link-98" class="py-name"><a title="apiclient.http.MediaUpload.new_from_json
-oauth2client.client.Credentials.new_from_json" class="py-name" href="#" onclick="return doclink('link-98', 'new_from_json', 'link-87');">new_from_json</a></tt><tt class="py-op">(</tt><tt class="py-name">json</tt><tt class="py-op">)</tt> </tt>
+<a name="L278"></a><tt class="py-lineno">278</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt id="link-99" class="py-name"><a title="oauth2client.client.Credentials" class="py-name" href="#" onclick="return doclink('link-99', 'Credentials', 'link-29');">Credentials</a></tt><tt class="py-op">.</tt><tt id="link-100" class="py-name"><a title="apiclient.http.MediaUpload.new_from_json
+oauth2client.client.Credentials.new_from_json" class="py-name" href="#" onclick="return doclink('link-100', 'new_from_json', 'link-89');">new_from_json</a></tt><tt class="py-op">(</tt><tt class="py-name">json</tt><tt class="py-op">)</tt> </tt>
 <a name="L279"></a><tt class="py-lineno">279</tt>  <tt class="py-line"> </tt>
 <a name="L280"></a><tt class="py-lineno">280</tt>  <tt class="py-line">    <tt class="py-name">credential</tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
 <a name="L281"></a><tt class="py-lineno">281</tt>  <tt class="py-line">    <tt class="py-name">entity</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_model</tt><tt class="py-op">.</tt><tt class="py-name">get_by_key_name</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">)</tt> </tt>
 <a name="L282"></a><tt class="py-lineno">282</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">entity</tt> <tt class="py-keyword">is</tt> <tt class="py-keyword">not</tt> <tt class="py-name">None</tt><tt class="py-op">:</tt> </tt>
 <a name="L283"></a><tt class="py-lineno">283</tt>  <tt class="py-line">      <tt class="py-name">credential</tt> <tt class="py-op">=</tt> <tt class="py-name">getattr</tt><tt class="py-op">(</tt><tt class="py-name">entity</tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_property_name</tt><tt class="py-op">)</tt> </tt>
 <a name="L284"></a><tt class="py-lineno">284</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-name">credential</tt> <tt class="py-keyword">and</tt> <tt class="py-name">hasattr</tt><tt class="py-op">(</tt><tt class="py-name">credential</tt><tt class="py-op">,</tt> <tt class="py-string">'set_store'</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-<a name="L285"></a><tt class="py-lineno">285</tt>  <tt class="py-line">        <tt class="py-name">credential</tt><tt class="py-op">.</tt><tt id="link-99" class="py-name" targets="Method oauth2client.client.OAuth2Credentials.set_store()=oauth2client.client.OAuth2Credentials-class.html#set_store"><a title="oauth2client.client.OAuth2Credentials.set_store" class="py-name" href="#" onclick="return doclink('link-99', 'set_store', 'link-99');">set_store</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">)</tt> </tt>
+<a name="L285"></a><tt class="py-lineno">285</tt>  <tt class="py-line">        <tt class="py-name">credential</tt><tt class="py-op">.</tt><tt id="link-101" class="py-name" targets="Method oauth2client.client.OAuth2Credentials.set_store()=oauth2client.client.OAuth2Credentials-class.html#set_store"><a title="oauth2client.client.OAuth2Credentials.set_store" class="py-name" href="#" onclick="return doclink('link-101', 'set_store', 'link-101');">set_store</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">)</tt> </tt>
 <a name="L286"></a><tt class="py-lineno">286</tt>  <tt class="py-line">        <tt class="py-keyword">if</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">:</tt> </tt>
-<a name="L287"></a><tt class="py-lineno">287</tt>  <tt class="py-line">          <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">.</tt><tt id="link-100" class="py-name" targets="Method oauth2client.client.MemoryCache.set()=oauth2client.client.MemoryCache-class.html#set"><a title="oauth2client.client.MemoryCache.set" class="py-name" href="#" onclick="return doclink('link-100', 'set', 'link-100');">set</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">,</tt> <tt class="py-name">credential</tt><tt class="py-op">.</tt><tt id="link-101" class="py-name"><a title="apiclient.http.HttpRequest.to_json
+<a name="L287"></a><tt class="py-lineno">287</tt>  <tt class="py-line">          <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">.</tt><tt id="link-102" class="py-name" targets="Method oauth2client.client.MemoryCache.set()=oauth2client.client.MemoryCache-class.html#set"><a title="oauth2client.client.MemoryCache.set" class="py-name" href="#" onclick="return doclink('link-102', 'set', 'link-102');">set</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">,</tt> <tt class="py-name">credential</tt><tt class="py-op">.</tt><tt id="link-103" class="py-name"><a title="apiclient.http.HttpRequest.to_json
 apiclient.http.MediaFileUpload.to_json
 apiclient.http.MediaIoBaseUpload.to_json
 apiclient.http.MediaUpload.to_json
 oauth2client.client.Credentials.to_json
-oauth2client.client.OAuth2Credentials.to_json" class="py-name" href="#" onclick="return doclink('link-101', 'to_json', 'link-83');">to_json</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+oauth2client.client.OAuth2Credentials.to_json" class="py-name" href="#" onclick="return doclink('link-103', 'to_json', 'link-85');">to_json</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L288"></a><tt class="py-lineno">288</tt>  <tt class="py-line"> </tt>
 <a name="L289"></a><tt class="py-lineno">289</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">credential</tt> </tt>
 </div><a name="L290"></a><tt class="py-lineno">290</tt>  <tt class="py-line"> </tt>
@@ -448,27 +450,27 @@
 <a name="L295"></a><tt class="py-lineno">295</tt>  <tt class="py-line"><tt class="py-docstring">      credentials: Credentials, the credentials to store.</tt> </tt>
 <a name="L296"></a><tt class="py-lineno">296</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
 <a name="L297"></a><tt class="py-lineno">297</tt>  <tt class="py-line">    <tt class="py-name">entity</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_model</tt><tt class="py-op">.</tt><tt class="py-name">get_or_insert</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">)</tt> </tt>
-<a name="L298"></a><tt class="py-lineno">298</tt>  <tt class="py-line">    <tt class="py-name">setattr</tt><tt class="py-op">(</tt><tt class="py-name">entity</tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_property_name</tt><tt class="py-op">,</tt> <tt id="link-102" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-102', 'credentials', 'link-85');">credentials</a></tt><tt class="py-op">)</tt> </tt>
-<a name="L299"></a><tt class="py-lineno">299</tt>  <tt class="py-line">    <tt class="py-name">entity</tt><tt class="py-op">.</tt><tt id="link-103" class="py-name"><a title="oauth2client.client.Storage.put" class="py-name" href="#" onclick="return doclink('link-103', 'put', 'link-56');">put</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
+<a name="L298"></a><tt class="py-lineno">298</tt>  <tt class="py-line">    <tt class="py-name">setattr</tt><tt class="py-op">(</tt><tt class="py-name">entity</tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_property_name</tt><tt class="py-op">,</tt> <tt id="link-104" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-104', 'credentials', 'link-87');">credentials</a></tt><tt class="py-op">)</tt> </tt>
+<a name="L299"></a><tt class="py-lineno">299</tt>  <tt class="py-line">    <tt class="py-name">entity</tt><tt class="py-op">.</tt><tt id="link-105" class="py-name"><a title="oauth2client.client.Storage.put" class="py-name" href="#" onclick="return doclink('link-105', 'put', 'link-56');">put</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L300"></a><tt class="py-lineno">300</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">:</tt> </tt>
-<a name="L301"></a><tt class="py-lineno">301</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">.</tt><tt id="link-104" class="py-name"><a title="oauth2client.client.MemoryCache.set" class="py-name" href="#" onclick="return doclink('link-104', 'set', 'link-100');">set</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">,</tt> <tt id="link-105" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-105', 'credentials', 'link-85');">credentials</a></tt><tt class="py-op">.</tt><tt id="link-106" class="py-name"><a title="apiclient.http.HttpRequest.to_json
+<a name="L301"></a><tt class="py-lineno">301</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">.</tt><tt id="link-106" class="py-name"><a title="oauth2client.client.MemoryCache.set" class="py-name" href="#" onclick="return doclink('link-106', 'set', 'link-102');">set</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">,</tt> <tt id="link-107" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-107', 'credentials', 'link-87');">credentials</a></tt><tt class="py-op">.</tt><tt id="link-108" class="py-name"><a title="apiclient.http.HttpRequest.to_json
 apiclient.http.MediaFileUpload.to_json
 apiclient.http.MediaIoBaseUpload.to_json
 apiclient.http.MediaUpload.to_json
 oauth2client.client.Credentials.to_json
-oauth2client.client.OAuth2Credentials.to_json" class="py-name" href="#" onclick="return doclink('link-106', 'to_json', 'link-83');">to_json</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+oauth2client.client.OAuth2Credentials.to_json" class="py-name" href="#" onclick="return doclink('link-108', 'to_json', 'link-85');">to_json</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L302"></a><tt class="py-lineno">302</tt>  <tt class="py-line"> </tt>
 <a name="StorageByKeyName.locked_delete"></a><div id="StorageByKeyName.locked_delete-def"><a name="L303"></a><tt class="py-lineno">303</tt> <a class="py-toggle" href="#" id="StorageByKeyName.locked_delete-toggle" onclick="return toggle('StorageByKeyName.locked_delete');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.StorageByKeyName-class.html#locked_delete">locked_delete</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="StorageByKeyName.locked_delete-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="StorageByKeyName.locked_delete-expanded"><a name="L304"></a><tt class="py-lineno">304</tt>  <tt class="py-line">    <tt class="py-docstring">"""Delete Credential from datastore."""</tt> </tt>
 <a name="L305"></a><tt class="py-lineno">305</tt>  <tt class="py-line"> </tt>
 <a name="L306"></a><tt class="py-lineno">306</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">:</tt> </tt>
-<a name="L307"></a><tt class="py-lineno">307</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">.</tt><tt id="link-107" class="py-name" targets="Method oauth2client.client.MemoryCache.delete()=oauth2client.client.MemoryCache-class.html#delete,Method oauth2client.client.Storage.delete()=oauth2client.client.Storage-class.html#delete"><a title="oauth2client.client.MemoryCache.delete
-oauth2client.client.Storage.delete" class="py-name" href="#" onclick="return doclink('link-107', 'delete', 'link-107');">delete</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">)</tt> </tt>
+<a name="L307"></a><tt class="py-lineno">307</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_cache</tt><tt class="py-op">.</tt><tt id="link-109" class="py-name" targets="Method oauth2client.client.MemoryCache.delete()=oauth2client.client.MemoryCache-class.html#delete,Method oauth2client.client.Storage.delete()=oauth2client.client.Storage-class.html#delete"><a title="oauth2client.client.MemoryCache.delete
+oauth2client.client.Storage.delete" class="py-name" href="#" onclick="return doclink('link-109', 'delete', 'link-109');">delete</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">)</tt> </tt>
 <a name="L308"></a><tt class="py-lineno">308</tt>  <tt class="py-line"> </tt>
 <a name="L309"></a><tt class="py-lineno">309</tt>  <tt class="py-line">    <tt class="py-name">entity</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_model</tt><tt class="py-op">.</tt><tt class="py-name">get_by_key_name</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_key_name</tt><tt class="py-op">)</tt> </tt>
 <a name="L310"></a><tt class="py-lineno">310</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">entity</tt> <tt class="py-keyword">is</tt> <tt class="py-keyword">not</tt> <tt class="py-name">None</tt><tt class="py-op">:</tt> </tt>
-<a name="L311"></a><tt class="py-lineno">311</tt>  <tt class="py-line">      <tt class="py-name">entity</tt><tt class="py-op">.</tt><tt id="link-108" class="py-name"><a title="oauth2client.client.MemoryCache.delete
-oauth2client.client.Storage.delete" class="py-name" href="#" onclick="return doclink('link-108', 'delete', 'link-107');">delete</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
+<a name="L311"></a><tt class="py-lineno">311</tt>  <tt class="py-line">      <tt class="py-name">entity</tt><tt class="py-op">.</tt><tt id="link-110" class="py-name"><a title="oauth2client.client.MemoryCache.delete
+oauth2client.client.Storage.delete" class="py-name" href="#" onclick="return doclink('link-110', 'delete', 'link-109');">delete</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 </div></div><a name="L312"></a><tt class="py-lineno">312</tt>  <tt class="py-line"> </tt>
 <a name="CredentialsModel"></a><div id="CredentialsModel-def"><a name="L313"></a><tt class="py-lineno">313</tt>  <tt class="py-line"> </tt>
 <a name="L314"></a><tt class="py-lineno">314</tt> <a class="py-toggle" href="#" id="CredentialsModel-toggle" onclick="return toggle('CredentialsModel');">-</a><tt class="py-line"><tt class="py-keyword">class</tt> <a class="py-def-name" href="oauth2client.appengine.CredentialsModel-class.html">CredentialsModel</a><tt class="py-op">(</tt><tt class="py-base-class">db</tt><tt class="py-op">.</tt><tt class="py-base-class">Model</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
@@ -476,7 +478,7 @@
 <a name="L316"></a><tt class="py-lineno">316</tt>  <tt class="py-line"><tt class="py-docstring"></tt> </tt>
 <a name="L317"></a><tt class="py-lineno">317</tt>  <tt class="py-line"><tt class="py-docstring">  Storage of the model is keyed by the user.user_id().</tt> </tt>
 <a name="L318"></a><tt class="py-lineno">318</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
-<a name="L319"></a><tt class="py-lineno">319</tt>  <tt class="py-line">  <tt id="link-109" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-109', 'credentials', 'link-85');">credentials</a></tt> <tt class="py-op">=</tt> <tt id="link-110" class="py-name"><a title="oauth2client.appengine.CredentialsProperty" class="py-name" href="#" onclick="return doclink('link-110', 'CredentialsProperty', 'link-81');">CredentialsProperty</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
+<a name="L319"></a><tt class="py-lineno">319</tt>  <tt class="py-line">  <tt id="link-111" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-111', 'credentials', 'link-87');">credentials</a></tt> <tt class="py-op">=</tt> <tt id="link-112" class="py-name"><a title="oauth2client.appengine.CredentialsProperty" class="py-name" href="#" onclick="return doclink('link-112', 'CredentialsProperty', 'link-83');">CredentialsProperty</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L320"></a><tt class="py-lineno">320</tt>  <tt class="py-line"> </tt>
 <a name="_build_state_value"></a><div id="_build_state_value-def"><a name="L321"></a><tt class="py-lineno">321</tt>  <tt class="py-line"> </tt>
 <a name="L322"></a><tt class="py-lineno">322</tt> <a class="py-toggle" href="#" id="_build_state_value-toggle" onclick="return toggle('_build_state_value');">-</a><tt class="py-line"><tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine-module.html#_build_state_value">_build_state_value</a><tt class="py-op">(</tt><tt class="py-param">request_handler</tt><tt class="py-op">,</tt> <tt class="py-param">user</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
@@ -492,11 +494,11 @@
 <a name="L332"></a><tt class="py-lineno">332</tt>  <tt class="py-line"><tt class="py-docstring">  Returns:</tt> </tt>
 <a name="L333"></a><tt class="py-lineno">333</tt>  <tt class="py-line"><tt class="py-docstring">    The state value as a string.</tt> </tt>
 <a name="L334"></a><tt class="py-lineno">334</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
-<a name="L335"></a><tt class="py-lineno">335</tt>  <tt class="py-line">  <tt class="py-name">uri</tt> <tt class="py-op">=</tt> <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-111" class="py-name" targets="Method apiclient.http.HttpMock.request()=apiclient.http.HttpMock-class.html#request,Method apiclient.http.HttpMockSequence.request()=apiclient.http.HttpMockSequence-class.html#request,Method apiclient.model.BaseModel.request()=apiclient.model.BaseModel-class.html#request,Method apiclient.model.Model.request()=apiclient.model.Model-class.html#request"><a title="apiclient.http.HttpMock.request
+<a name="L335"></a><tt class="py-lineno">335</tt>  <tt class="py-line">  <tt class="py-name">uri</tt> <tt class="py-op">=</tt> <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-113" class="py-name" targets="Method apiclient.http.HttpMock.request()=apiclient.http.HttpMock-class.html#request,Method apiclient.http.HttpMockSequence.request()=apiclient.http.HttpMockSequence-class.html#request,Method apiclient.model.BaseModel.request()=apiclient.model.BaseModel-class.html#request,Method apiclient.model.Model.request()=apiclient.model.Model-class.html#request"><a title="apiclient.http.HttpMock.request
 apiclient.http.HttpMockSequence.request
 apiclient.model.BaseModel.request
-apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-111', 'request', 'link-111');">request</a></tt><tt class="py-op">.</tt><tt class="py-name">url</tt> </tt>
-<a name="L336"></a><tt class="py-lineno">336</tt>  <tt class="py-line">  <tt class="py-name">token</tt> <tt class="py-op">=</tt> <tt id="link-112" class="py-name"><a title="oauth2client.xsrfutil" class="py-name" href="#" onclick="return doclink('link-112', 'xsrfutil', 'link-18');">xsrfutil</a></tt><tt class="py-op">.</tt><tt class="py-name">generate_token</tt><tt class="py-op">(</tt><tt id="link-113" class="py-name" targets="Function oauth2client.appengine.xsrf_secret_key()=oauth2client.appengine-module.html#xsrf_secret_key"><a title="oauth2client.appengine.xsrf_secret_key" class="py-name" href="#" onclick="return doclink('link-113', 'xsrf_secret_key', 'link-113');">xsrf_secret_key</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">.</tt><tt class="py-name">user_id</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> </tt>
+apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-113', 'request', 'link-113');">request</a></tt><tt class="py-op">.</tt><tt class="py-name">url</tt> </tt>
+<a name="L336"></a><tt class="py-lineno">336</tt>  <tt class="py-line">  <tt class="py-name">token</tt> <tt class="py-op">=</tt> <tt id="link-114" class="py-name"><a title="oauth2client.xsrfutil" class="py-name" href="#" onclick="return doclink('link-114', 'xsrfutil', 'link-18');">xsrfutil</a></tt><tt class="py-op">.</tt><tt id="link-115" class="py-name" targets="Function oauth2client.xsrfutil.generate_token()=oauth2client.xsrfutil-module.html#generate_token"><a title="oauth2client.xsrfutil.generate_token" class="py-name" href="#" onclick="return doclink('link-115', 'generate_token', 'link-115');">generate_token</a></tt><tt class="py-op">(</tt><tt id="link-116" class="py-name" targets="Function oauth2client.appengine.xsrf_secret_key()=oauth2client.appengine-module.html#xsrf_secret_key"><a title="oauth2client.appengine.xsrf_secret_key" class="py-name" href="#" onclick="return doclink('link-116', 'xsrf_secret_key', 'link-116');">xsrf_secret_key</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">.</tt><tt class="py-name">user_id</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> </tt>
 <a name="L337"></a><tt class="py-lineno">337</tt>  <tt class="py-line">                                  <tt class="py-name">action_id</tt><tt class="py-op">=</tt><tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">uri</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L338"></a><tt class="py-lineno">338</tt>  <tt class="py-line">  <tt class="py-keyword">return</tt>  <tt class="py-name">uri</tt> <tt class="py-op">+</tt> <tt class="py-string">':'</tt> <tt class="py-op">+</tt> <tt class="py-name">token</tt> </tt>
 </div><a name="L339"></a><tt class="py-lineno">339</tt>  <tt class="py-line"> </tt>
@@ -517,9 +519,9 @@
 <a name="L354"></a><tt class="py-lineno">354</tt>  <tt class="py-line"><tt class="py-docstring">    The redirect URI.</tt> </tt>
 <a name="L355"></a><tt class="py-lineno">355</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
 <a name="L356"></a><tt class="py-lineno">356</tt>  <tt class="py-line">  <tt class="py-name">uri</tt><tt class="py-op">,</tt> <tt class="py-name">token</tt> <tt class="py-op">=</tt> <tt class="py-name">state</tt><tt class="py-op">.</tt><tt class="py-name">rsplit</tt><tt class="py-op">(</tt><tt class="py-string">':'</tt><tt class="py-op">,</tt> <tt class="py-number">1</tt><tt class="py-op">)</tt> </tt>
-<a name="L357"></a><tt class="py-lineno">357</tt>  <tt class="py-line">  <tt class="py-keyword">if</tt> <tt class="py-keyword">not</tt> <tt id="link-114" class="py-name"><a title="oauth2client.xsrfutil" class="py-name" href="#" onclick="return doclink('link-114', 'xsrfutil', 'link-18');">xsrfutil</a></tt><tt class="py-op">.</tt><tt class="py-name">validate_token</tt><tt class="py-op">(</tt><tt id="link-115" class="py-name"><a title="oauth2client.appengine.xsrf_secret_key" class="py-name" href="#" onclick="return doclink('link-115', 'xsrf_secret_key', 'link-113');">xsrf_secret_key</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-name">token</tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">.</tt><tt class="py-name">user_id</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> </tt>
+<a name="L357"></a><tt class="py-lineno">357</tt>  <tt class="py-line">  <tt class="py-keyword">if</tt> <tt class="py-keyword">not</tt> <tt id="link-117" class="py-name"><a title="oauth2client.xsrfutil" class="py-name" href="#" onclick="return doclink('link-117', 'xsrfutil', 'link-18');">xsrfutil</a></tt><tt class="py-op">.</tt><tt id="link-118" class="py-name" targets="Function oauth2client.xsrfutil.validate_token()=oauth2client.xsrfutil-module.html#validate_token"><a title="oauth2client.xsrfutil.validate_token" class="py-name" href="#" onclick="return doclink('link-118', 'validate_token', 'link-118');">validate_token</a></tt><tt class="py-op">(</tt><tt id="link-119" class="py-name"><a title="oauth2client.appengine.xsrf_secret_key" class="py-name" href="#" onclick="return doclink('link-119', 'xsrf_secret_key', 'link-116');">xsrf_secret_key</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-name">token</tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">.</tt><tt class="py-name">user_id</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> </tt>
 <a name="L358"></a><tt class="py-lineno">358</tt>  <tt class="py-line">                                 <tt class="py-name">action_id</tt><tt class="py-op">=</tt><tt class="py-name">uri</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-<a name="L359"></a><tt class="py-lineno">359</tt>  <tt class="py-line">    <tt class="py-keyword">raise</tt> <tt id="link-116" class="py-name" targets="Class oauth2client.appengine.InvalidXsrfTokenError=oauth2client.appengine.InvalidXsrfTokenError-class.html"><a title="oauth2client.appengine.InvalidXsrfTokenError" class="py-name" href="#" onclick="return doclink('link-116', 'InvalidXsrfTokenError', 'link-116');">InvalidXsrfTokenError</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
+<a name="L359"></a><tt class="py-lineno">359</tt>  <tt class="py-line">    <tt class="py-keyword">raise</tt> <tt id="link-120" class="py-name" targets="Class oauth2client.appengine.InvalidXsrfTokenError=oauth2client.appengine.InvalidXsrfTokenError-class.html"><a title="oauth2client.appengine.InvalidXsrfTokenError" class="py-name" href="#" onclick="return doclink('link-120', 'InvalidXsrfTokenError', 'link-120');">InvalidXsrfTokenError</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L360"></a><tt class="py-lineno">360</tt>  <tt class="py-line"> </tt>
 <a name="L361"></a><tt class="py-lineno">361</tt>  <tt class="py-line">  <tt class="py-keyword">return</tt> <tt class="py-name">uri</tt> </tt>
 </div><a name="L362"></a><tt class="py-lineno">362</tt>  <tt class="py-line"> </tt>
@@ -548,7 +550,7 @@
 <a name="L385"></a><tt class="py-lineno">385</tt>  <tt class="py-line"><tt class="py-docstring"></tt> </tt>
 <a name="L386"></a><tt class="py-lineno">386</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
 <a name="L387"></a><tt class="py-lineno">387</tt>  <tt class="py-line"> </tt>
-<a name="L388"></a><tt class="py-lineno">388</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-117" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-117', 'positional', 'link-65');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">4</tt><tt class="py-op">)</tt> </tt>
+<a name="L388"></a><tt class="py-lineno">388</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-121" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-121', 'positional', 'link-65');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">4</tt><tt class="py-op">)</tt> </tt>
 <a name="OAuth2Decorator.__init__"></a><div id="OAuth2Decorator.__init__-def"><a name="L389"></a><tt class="py-lineno">389</tt> <a class="py-toggle" href="#" id="OAuth2Decorator.__init__-toggle" onclick="return toggle('OAuth2Decorator.__init__');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.OAuth2Decorator-class.html#__init__">__init__</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">client_id</tt><tt class="py-op">,</tt> <tt class="py-param">client_secret</tt><tt class="py-op">,</tt> <tt class="py-param">scope</tt><tt class="py-op">,</tt> </tt>
 <a name="L390"></a><tt class="py-lineno">390</tt>  <tt class="py-line">               <tt class="py-param">auth_uri</tt><tt class="py-op">=</tt><tt class="py-string">'https://accounts.google.com/o/oauth2/auth'</tt><tt class="py-op">,</tt> </tt>
 <a name="L391"></a><tt class="py-lineno">391</tt>  <tt class="py-line">               <tt class="py-param">token_uri</tt><tt class="py-op">=</tt><tt class="py-string">'https://accounts.google.com/o/oauth2/token'</tt><tt class="py-op">,</tt> </tt>
@@ -579,7 +581,7 @@
 <a name="L416"></a><tt class="py-lineno">416</tt>  <tt class="py-line"><tt class="py-docstring">        OAuth2WebServerFlow constructor.</tt> </tt>
 <a name="L417"></a><tt class="py-lineno">417</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
 <a name="L418"></a><tt class="py-lineno">418</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
-<a name="L419"></a><tt class="py-lineno">419</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-118" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-118', 'credentials', 'link-85');">credentials</a></tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
+<a name="L419"></a><tt class="py-lineno">419</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-122" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-122', 'credentials', 'link-87');">credentials</a></tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
 <a name="L420"></a><tt class="py-lineno">420</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_client_id</tt> <tt class="py-op">=</tt> <tt class="py-name">client_id</tt> </tt>
 <a name="L421"></a><tt class="py-lineno">421</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_client_secret</tt> <tt class="py-op">=</tt> <tt class="py-name">client_secret</tt> </tt>
 <a name="L422"></a><tt class="py-lineno">422</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_scope</tt> <tt class="py-op">=</tt> <tt class="py-name">scope</tt> </tt>
@@ -589,15 +591,15 @@
 <a name="L426"></a><tt class="py-lineno">426</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_kwargs</tt> <tt class="py-op">=</tt> <tt class="py-name">kwargs</tt> </tt>
 <a name="L427"></a><tt class="py-lineno">427</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_message</tt> <tt class="py-op">=</tt> <tt class="py-name">message</tt> </tt>
 <a name="L428"></a><tt class="py-lineno">428</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_in_error</tt> <tt class="py-op">=</tt> <tt class="py-name">False</tt> </tt>
-<a name="L429"></a><tt class="py-lineno">429</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_callback_path</tt> <tt class="py-op">=</tt> <tt id="link-119" class="py-name" targets="Variable oauth2client.appengine.OAuth2Decorator.callback_path=oauth2client.appengine.OAuth2Decorator-class.html#callback_path"><a title="oauth2client.appengine.OAuth2Decorator.callback_path" class="py-name" href="#" onclick="return doclink('link-119', 'callback_path', 'link-119');">callback_path</a></tt> </tt>
+<a name="L429"></a><tt class="py-lineno">429</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_callback_path</tt> <tt class="py-op">=</tt> <tt id="link-123" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator.callback_path()=oauth2client.appengine.OAuth2Decorator-class.html#callback_path"><a title="oauth2client.appengine.OAuth2Decorator.callback_path" class="py-name" href="#" onclick="return doclink('link-123', 'callback_path', 'link-123');">callback_path</a></tt> </tt>
 </div><a name="L430"></a><tt class="py-lineno">430</tt>  <tt class="py-line"> </tt>
 <a name="OAuth2Decorator._display_error_message"></a><div id="OAuth2Decorator._display_error_message-def"><a name="L431"></a><tt class="py-lineno">431</tt> <a class="py-toggle" href="#" id="OAuth2Decorator._display_error_message-toggle" onclick="return toggle('OAuth2Decorator._display_error_message');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.OAuth2Decorator-class.html#_display_error_message">_display_error_message</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">request_handler</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-</div><div id="OAuth2Decorator._display_error_message-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="OAuth2Decorator._display_error_message-expanded"><a name="L432"></a><tt class="py-lineno">432</tt>  <tt class="py-line">    <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-120" class="py-name" targets="Method apiclient.model.BaseModel.response()=apiclient.model.BaseModel-class.html#response,Method apiclient.model.Model.response()=apiclient.model.Model-class.html#response"><a title="apiclient.model.BaseModel.response
-apiclient.model.Model.response" class="py-name" href="#" onclick="return doclink('link-120', 'response', 'link-120');">response</a></tt><tt class="py-op">.</tt><tt class="py-name">out</tt><tt class="py-op">.</tt><tt class="py-name">write</tt><tt class="py-op">(</tt><tt class="py-string">'&lt;html&gt;&lt;body&gt;'</tt><tt class="py-op">)</tt> </tt>
-<a name="L433"></a><tt class="py-lineno">433</tt>  <tt class="py-line">    <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-121" class="py-name"><a title="apiclient.model.BaseModel.response
-apiclient.model.Model.response" class="py-name" href="#" onclick="return doclink('link-121', 'response', 'link-120');">response</a></tt><tt class="py-op">.</tt><tt class="py-name">out</tt><tt class="py-op">.</tt><tt class="py-name">write</tt><tt class="py-op">(</tt><tt id="link-122" class="py-name" targets="Function oauth2client.appengine._safe_html()=oauth2client.appengine-module.html#_safe_html"><a title="oauth2client.appengine._safe_html" class="py-name" href="#" onclick="return doclink('link-122', '_safe_html', 'link-122');">_safe_html</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_message</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
-<a name="L434"></a><tt class="py-lineno">434</tt>  <tt class="py-line">    <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-123" class="py-name"><a title="apiclient.model.BaseModel.response
-apiclient.model.Model.response" class="py-name" href="#" onclick="return doclink('link-123', 'response', 'link-120');">response</a></tt><tt class="py-op">.</tt><tt class="py-name">out</tt><tt class="py-op">.</tt><tt class="py-name">write</tt><tt class="py-op">(</tt><tt class="py-string">'&lt;/body&gt;&lt;/html&gt;'</tt><tt class="py-op">)</tt> </tt>
+</div><div id="OAuth2Decorator._display_error_message-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="OAuth2Decorator._display_error_message-expanded"><a name="L432"></a><tt class="py-lineno">432</tt>  <tt class="py-line">    <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-124" class="py-name" targets="Method apiclient.model.BaseModel.response()=apiclient.model.BaseModel-class.html#response,Method apiclient.model.Model.response()=apiclient.model.Model-class.html#response"><a title="apiclient.model.BaseModel.response
+apiclient.model.Model.response" class="py-name" href="#" onclick="return doclink('link-124', 'response', 'link-124');">response</a></tt><tt class="py-op">.</tt><tt class="py-name">out</tt><tt class="py-op">.</tt><tt class="py-name">write</tt><tt class="py-op">(</tt><tt class="py-string">'&lt;html&gt;&lt;body&gt;'</tt><tt class="py-op">)</tt> </tt>
+<a name="L433"></a><tt class="py-lineno">433</tt>  <tt class="py-line">    <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-125" class="py-name"><a title="apiclient.model.BaseModel.response
+apiclient.model.Model.response" class="py-name" href="#" onclick="return doclink('link-125', 'response', 'link-124');">response</a></tt><tt class="py-op">.</tt><tt class="py-name">out</tt><tt class="py-op">.</tt><tt class="py-name">write</tt><tt class="py-op">(</tt><tt id="link-126" class="py-name" targets="Function oauth2client.appengine._safe_html()=oauth2client.appengine-module.html#_safe_html"><a title="oauth2client.appengine._safe_html" class="py-name" href="#" onclick="return doclink('link-126', '_safe_html', 'link-126');">_safe_html</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_message</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+<a name="L434"></a><tt class="py-lineno">434</tt>  <tt class="py-line">    <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-127" class="py-name"><a title="apiclient.model.BaseModel.response
+apiclient.model.Model.response" class="py-name" href="#" onclick="return doclink('link-127', 'response', 'link-124');">response</a></tt><tt class="py-op">.</tt><tt class="py-name">out</tt><tt class="py-op">.</tt><tt class="py-name">write</tt><tt class="py-op">(</tt><tt class="py-string">'&lt;/body&gt;&lt;/html&gt;'</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L435"></a><tt class="py-lineno">435</tt>  <tt class="py-line"> </tt>
 <a name="OAuth2Decorator.oauth_required"></a><div id="OAuth2Decorator.oauth_required-def"><a name="L436"></a><tt class="py-lineno">436</tt> <a class="py-toggle" href="#" id="OAuth2Decorator.oauth_required-toggle" onclick="return toggle('OAuth2Decorator.oauth_required');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.OAuth2Decorator-class.html#oauth_required">oauth_required</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">method</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="OAuth2Decorator.oauth_required-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="OAuth2Decorator.oauth_required-expanded"><a name="L437"></a><tt class="py-lineno">437</tt>  <tt class="py-line">    <tt class="py-docstring">"""Decorator that starts the OAuth 2.0 dance.</tt> </tt>
@@ -612,34 +614,34 @@
 <a name="L446"></a><tt class="py-lineno">446</tt>  <tt class="py-line"> </tt>
 <a name="L447"></a><tt class="py-lineno">447</tt>  <tt class="py-line">    <tt class="py-keyword">def</tt> <tt class="py-def-name">check_oauth</tt><tt class="py-op">(</tt><tt class="py-param">request_handler</tt><tt class="py-op">,</tt> <tt class="py-op">*</tt><tt class="py-param">args</tt><tt class="py-op">,</tt> <tt class="py-op">**</tt><tt class="py-param">kwargs</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 <a name="L448"></a><tt class="py-lineno">448</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_in_error</tt><tt class="py-op">:</tt> </tt>
-<a name="L449"></a><tt class="py-lineno">449</tt>  <tt class="py-line">        <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-124" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator._display_error_message()=oauth2client.appengine.OAuth2Decorator-class.html#_display_error_message"><a title="oauth2client.appengine.OAuth2Decorator._display_error_message" class="py-name" href="#" onclick="return doclink('link-124', '_display_error_message', 'link-124');">_display_error_message</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">)</tt> </tt>
+<a name="L449"></a><tt class="py-lineno">449</tt>  <tt class="py-line">        <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-128" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator._display_error_message()=oauth2client.appengine.OAuth2Decorator-class.html#_display_error_message"><a title="oauth2client.appengine.OAuth2Decorator._display_error_message" class="py-name" href="#" onclick="return doclink('link-128', '_display_error_message', 'link-128');">_display_error_message</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">)</tt> </tt>
 <a name="L450"></a><tt class="py-lineno">450</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> </tt>
 <a name="L451"></a><tt class="py-lineno">451</tt>  <tt class="py-line"> </tt>
 <a name="L452"></a><tt class="py-lineno">452</tt>  <tt class="py-line">      <tt class="py-name">user</tt> <tt class="py-op">=</tt> <tt class="py-name">users</tt><tt class="py-op">.</tt><tt class="py-name">get_current_user</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L453"></a><tt class="py-lineno">453</tt>  <tt class="py-line">      <tt class="py-comment"># Don't use @login_decorator as this could be used in a POST request.</tt> </tt>
 <a name="L454"></a><tt class="py-lineno">454</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-keyword">not</tt> <tt class="py-name">user</tt><tt class="py-op">:</tt> </tt>
 <a name="L455"></a><tt class="py-lineno">455</tt>  <tt class="py-line">        <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt class="py-name">redirect</tt><tt class="py-op">(</tt><tt class="py-name">users</tt><tt class="py-op">.</tt><tt class="py-name">create_login_url</tt><tt class="py-op">(</tt> </tt>
-<a name="L456"></a><tt class="py-lineno">456</tt>  <tt class="py-line">            <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-125" class="py-name"><a title="apiclient.http.HttpMock.request
+<a name="L456"></a><tt class="py-lineno">456</tt>  <tt class="py-line">            <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-129" class="py-name"><a title="apiclient.http.HttpMock.request
 apiclient.http.HttpMockSequence.request
 apiclient.model.BaseModel.request
-apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-125', 'request', 'link-111');">request</a></tt><tt class="py-op">.</tt><tt class="py-name">uri</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-129', 'request', 'link-113');">request</a></tt><tt class="py-op">.</tt><tt class="py-name">uri</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L457"></a><tt class="py-lineno">457</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> </tt>
 <a name="L458"></a><tt class="py-lineno">458</tt>  <tt class="py-line"> </tt>
-<a name="L459"></a><tt class="py-lineno">459</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-126" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator._create_flow()=oauth2client.appengine.OAuth2Decorator-class.html#_create_flow"><a title="oauth2client.appengine.OAuth2Decorator._create_flow" class="py-name" href="#" onclick="return doclink('link-126', '_create_flow', 'link-126');">_create_flow</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">)</tt> </tt>
+<a name="L459"></a><tt class="py-lineno">459</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-130" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator._create_flow()=oauth2client.appengine.OAuth2Decorator-class.html#_create_flow"><a title="oauth2client.appengine.OAuth2Decorator._create_flow" class="py-name" href="#" onclick="return doclink('link-130', '_create_flow', 'link-130');">_create_flow</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">)</tt> </tt>
 <a name="L460"></a><tt class="py-lineno">460</tt>  <tt class="py-line"> </tt>
 <a name="L461"></a><tt class="py-lineno">461</tt>  <tt class="py-line">      <tt class="py-comment"># Store the request URI in 'state' so we can use it later</tt> </tt>
-<a name="L462"></a><tt class="py-lineno">462</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt><tt class="py-op">.</tt><tt class="py-name">params</tt><tt class="py-op">[</tt><tt class="py-string">'state'</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt id="link-127" class="py-name" targets="Function oauth2client.appengine._build_state_value()=oauth2client.appengine-module.html#_build_state_value"><a title="oauth2client.appengine._build_state_value" class="py-name" href="#" onclick="return doclink('link-127', '_build_state_value', 'link-127');">_build_state_value</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">)</tt> </tt>
-<a name="L463"></a><tt class="py-lineno">463</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-128" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-128', 'credentials', 'link-85');">credentials</a></tt> <tt class="py-op">=</tt> <tt id="link-129" class="py-name" targets="Class oauth2client.appengine.StorageByKeyName=oauth2client.appengine.StorageByKeyName-class.html"><a title="oauth2client.appengine.StorageByKeyName" class="py-name" href="#" onclick="return doclink('link-129', 'StorageByKeyName', 'link-129');">StorageByKeyName</a></tt><tt class="py-op">(</tt> </tt>
-<a name="L464"></a><tt class="py-lineno">464</tt>  <tt class="py-line">          <tt id="link-130" class="py-name" targets="Class oauth2client.appengine.CredentialsModel=oauth2client.appengine.CredentialsModel-class.html"><a title="oauth2client.appengine.CredentialsModel" class="py-name" href="#" onclick="return doclink('link-130', 'CredentialsModel', 'link-130');">CredentialsModel</a></tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">.</tt><tt class="py-name">user_id</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-string">'credentials'</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-131" class="py-name"><a title="apiclient.schema.Schemas.get
+<a name="L462"></a><tt class="py-lineno">462</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt><tt class="py-op">.</tt><tt class="py-name">params</tt><tt class="py-op">[</tt><tt class="py-string">'state'</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt id="link-131" class="py-name" targets="Function oauth2client.appengine._build_state_value()=oauth2client.appengine-module.html#_build_state_value"><a title="oauth2client.appengine._build_state_value" class="py-name" href="#" onclick="return doclink('link-131', '_build_state_value', 'link-131');">_build_state_value</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">)</tt> </tt>
+<a name="L463"></a><tt class="py-lineno">463</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-132" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-132', 'credentials', 'link-87');">credentials</a></tt> <tt class="py-op">=</tt> <tt id="link-133" class="py-name" targets="Class oauth2client.appengine.StorageByKeyName=oauth2client.appengine.StorageByKeyName-class.html"><a title="oauth2client.appengine.StorageByKeyName" class="py-name" href="#" onclick="return doclink('link-133', 'StorageByKeyName', 'link-133');">StorageByKeyName</a></tt><tt class="py-op">(</tt> </tt>
+<a name="L464"></a><tt class="py-lineno">464</tt>  <tt class="py-line">          <tt id="link-134" class="py-name" targets="Class oauth2client.appengine.CredentialsModel=oauth2client.appengine.CredentialsModel-class.html"><a title="oauth2client.appengine.CredentialsModel" class="py-name" href="#" onclick="return doclink('link-134', 'CredentialsModel', 'link-134');">CredentialsModel</a></tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">.</tt><tt class="py-name">user_id</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-string">'credentials'</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-135" class="py-name"><a title="apiclient.schema.Schemas.get
 oauth2client.client.MemoryCache.get
-oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-131', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
+oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-135', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L465"></a><tt class="py-lineno">465</tt>  <tt class="py-line"> </tt>
-<a name="L466"></a><tt class="py-lineno">466</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-keyword">not</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-132" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator.has_credentials()=oauth2client.appengine.OAuth2Decorator-class.html#has_credentials"><a title="oauth2client.appengine.OAuth2Decorator.has_credentials" class="py-name" href="#" onclick="return doclink('link-132', 'has_credentials', 'link-132');">has_credentials</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-<a name="L467"></a><tt class="py-lineno">467</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt class="py-name">redirect</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-133" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator.authorize_url()=oauth2client.appengine.OAuth2Decorator-class.html#authorize_url"><a title="oauth2client.appengine.OAuth2Decorator.authorize_url" class="py-name" href="#" onclick="return doclink('link-133', 'authorize_url', 'link-133');">authorize_url</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+<a name="L466"></a><tt class="py-lineno">466</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-keyword">not</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-136" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator.has_credentials()=oauth2client.appengine.OAuth2Decorator-class.html#has_credentials"><a title="oauth2client.appengine.OAuth2Decorator.has_credentials" class="py-name" href="#" onclick="return doclink('link-136', 'has_credentials', 'link-136');">has_credentials</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
+<a name="L467"></a><tt class="py-lineno">467</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt class="py-name">redirect</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-137" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator.authorize_url()=oauth2client.appengine.OAuth2Decorator-class.html#authorize_url"><a title="oauth2client.appengine.OAuth2Decorator.authorize_url" class="py-name" href="#" onclick="return doclink('link-137', 'authorize_url', 'link-137');">authorize_url</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L468"></a><tt class="py-lineno">468</tt>  <tt class="py-line">      <tt class="py-keyword">try</tt><tt class="py-op">:</tt> </tt>
 <a name="L469"></a><tt class="py-lineno">469</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">method</tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">,</tt> <tt class="py-op">*</tt><tt class="py-name">args</tt><tt class="py-op">,</tt> <tt class="py-op">**</tt><tt class="py-name">kwargs</tt><tt class="py-op">)</tt> </tt>
-<a name="L470"></a><tt class="py-lineno">470</tt>  <tt class="py-line">      <tt class="py-keyword">except</tt> <tt id="link-134" class="py-name"><a title="oauth2client.client.AccessTokenRefreshError" class="py-name" href="#" onclick="return doclink('link-134', 'AccessTokenRefreshError', 'link-23');">AccessTokenRefreshError</a></tt><tt class="py-op">:</tt> </tt>
-<a name="L471"></a><tt class="py-lineno">471</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt class="py-name">redirect</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-135" class="py-name"><a title="oauth2client.appengine.OAuth2Decorator.authorize_url" class="py-name" href="#" onclick="return doclink('link-135', 'authorize_url', 'link-133');">authorize_url</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+<a name="L470"></a><tt class="py-lineno">470</tt>  <tt class="py-line">      <tt class="py-keyword">except</tt> <tt id="link-138" class="py-name"><a title="oauth2client.client.AccessTokenRefreshError" class="py-name" href="#" onclick="return doclink('link-138', 'AccessTokenRefreshError', 'link-23');">AccessTokenRefreshError</a></tt><tt class="py-op">:</tt> </tt>
+<a name="L471"></a><tt class="py-lineno">471</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt class="py-name">redirect</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-139" class="py-name"><a title="oauth2client.appengine.OAuth2Decorator.authorize_url" class="py-name" href="#" onclick="return doclink('link-139', 'authorize_url', 'link-137');">authorize_url</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L472"></a><tt class="py-lineno">472</tt>  <tt class="py-line"> </tt>
 <a name="L473"></a><tt class="py-lineno">473</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">check_oauth</tt> </tt>
 </div><a name="L474"></a><tt class="py-lineno">474</tt>  <tt class="py-line"> </tt>
@@ -654,12 +656,12 @@
 <a name="L483"></a><tt class="py-lineno">483</tt>  <tt class="py-line"><tt class="py-docstring">      request_handler: webapp.RequestHandler, the request handler.</tt> </tt>
 <a name="L484"></a><tt class="py-lineno">484</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
 <a name="L485"></a><tt class="py-lineno">485</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt> <tt class="py-keyword">is</tt> <tt class="py-name">None</tt><tt class="py-op">:</tt> </tt>
-<a name="L486"></a><tt class="py-lineno">486</tt>  <tt class="py-line">      <tt class="py-name">redirect_uri</tt> <tt class="py-op">=</tt> <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-136" class="py-name"><a title="apiclient.http.HttpMock.request
+<a name="L486"></a><tt class="py-lineno">486</tt>  <tt class="py-line">      <tt class="py-name">redirect_uri</tt> <tt class="py-op">=</tt> <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-140" class="py-name"><a title="apiclient.http.HttpMock.request
 apiclient.http.HttpMockSequence.request
 apiclient.model.BaseModel.request
-apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-136', 'request', 'link-111');">request</a></tt><tt class="py-op">.</tt><tt class="py-name">relative_url</tt><tt class="py-op">(</tt> </tt>
+apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-140', 'request', 'link-113');">request</a></tt><tt class="py-op">.</tt><tt class="py-name">relative_url</tt><tt class="py-op">(</tt> </tt>
 <a name="L487"></a><tt class="py-lineno">487</tt>  <tt class="py-line">          <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_callback_path</tt><tt class="py-op">)</tt> <tt class="py-comment"># Usually /oauth2callback</tt> </tt>
-<a name="L488"></a><tt class="py-lineno">488</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt> <tt class="py-op">=</tt> <tt id="link-137" class="py-name"><a title="oauth2client.client.OAuth2WebServerFlow" class="py-name" href="#" onclick="return doclink('link-137', 'OAuth2WebServerFlow', 'link-35');">OAuth2WebServerFlow</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_client_id</tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_client_secret</tt><tt class="py-op">,</tt> </tt>
+<a name="L488"></a><tt class="py-lineno">488</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt> <tt class="py-op">=</tt> <tt id="link-141" class="py-name"><a title="oauth2client.client.OAuth2WebServerFlow" class="py-name" href="#" onclick="return doclink('link-141', 'OAuth2WebServerFlow', 'link-35');">OAuth2WebServerFlow</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_client_id</tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_client_secret</tt><tt class="py-op">,</tt> </tt>
 <a name="L489"></a><tt class="py-lineno">489</tt>  <tt class="py-line">                                      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_scope</tt><tt class="py-op">,</tt> <tt class="py-name">redirect_uri</tt><tt class="py-op">=</tt><tt class="py-name">redirect_uri</tt><tt class="py-op">,</tt> </tt>
 <a name="L490"></a><tt class="py-lineno">490</tt>  <tt class="py-line">                                      <tt class="py-name">user_agent</tt><tt class="py-op">=</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_user_agent</tt><tt class="py-op">,</tt> </tt>
 <a name="L491"></a><tt class="py-lineno">491</tt>  <tt class="py-line">                                      <tt class="py-name">auth_uri</tt><tt class="py-op">=</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_auth_uri</tt><tt class="py-op">,</tt> </tt>
@@ -682,26 +684,26 @@
 <a name="L508"></a><tt class="py-lineno">508</tt>  <tt class="py-line"> </tt>
 <a name="L509"></a><tt class="py-lineno">509</tt>  <tt class="py-line">    <tt class="py-keyword">def</tt> <tt class="py-def-name">setup_oauth</tt><tt class="py-op">(</tt><tt class="py-param">request_handler</tt><tt class="py-op">,</tt> <tt class="py-op">*</tt><tt class="py-param">args</tt><tt class="py-op">,</tt> <tt class="py-op">**</tt><tt class="py-param">kwargs</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 <a name="L510"></a><tt class="py-lineno">510</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_in_error</tt><tt class="py-op">:</tt> </tt>
-<a name="L511"></a><tt class="py-lineno">511</tt>  <tt class="py-line">        <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-138" class="py-name"><a title="oauth2client.appengine.OAuth2Decorator._display_error_message" class="py-name" href="#" onclick="return doclink('link-138', '_display_error_message', 'link-124');">_display_error_message</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">)</tt> </tt>
+<a name="L511"></a><tt class="py-lineno">511</tt>  <tt class="py-line">        <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-142" class="py-name"><a title="oauth2client.appengine.OAuth2Decorator._display_error_message" class="py-name" href="#" onclick="return doclink('link-142', '_display_error_message', 'link-128');">_display_error_message</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">)</tt> </tt>
 <a name="L512"></a><tt class="py-lineno">512</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> </tt>
 <a name="L513"></a><tt class="py-lineno">513</tt>  <tt class="py-line"> </tt>
 <a name="L514"></a><tt class="py-lineno">514</tt>  <tt class="py-line">      <tt class="py-name">user</tt> <tt class="py-op">=</tt> <tt class="py-name">users</tt><tt class="py-op">.</tt><tt class="py-name">get_current_user</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L515"></a><tt class="py-lineno">515</tt>  <tt class="py-line">      <tt class="py-comment"># Don't use @login_decorator as this could be used in a POST request.</tt> </tt>
 <a name="L516"></a><tt class="py-lineno">516</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-keyword">not</tt> <tt class="py-name">user</tt><tt class="py-op">:</tt> </tt>
 <a name="L517"></a><tt class="py-lineno">517</tt>  <tt class="py-line">        <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt class="py-name">redirect</tt><tt class="py-op">(</tt><tt class="py-name">users</tt><tt class="py-op">.</tt><tt class="py-name">create_login_url</tt><tt class="py-op">(</tt> </tt>
-<a name="L518"></a><tt class="py-lineno">518</tt>  <tt class="py-line">            <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-139" class="py-name"><a title="apiclient.http.HttpMock.request
+<a name="L518"></a><tt class="py-lineno">518</tt>  <tt class="py-line">            <tt class="py-name">request_handler</tt><tt class="py-op">.</tt><tt id="link-143" class="py-name"><a title="apiclient.http.HttpMock.request
 apiclient.http.HttpMockSequence.request
 apiclient.model.BaseModel.request
-apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-139', 'request', 'link-111');">request</a></tt><tt class="py-op">.</tt><tt class="py-name">uri</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-143', 'request', 'link-113');">request</a></tt><tt class="py-op">.</tt><tt class="py-name">uri</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L519"></a><tt class="py-lineno">519</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> </tt>
 <a name="L520"></a><tt class="py-lineno">520</tt>  <tt class="py-line"> </tt>
-<a name="L521"></a><tt class="py-lineno">521</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-140" class="py-name"><a title="oauth2client.appengine.OAuth2Decorator._create_flow" class="py-name" href="#" onclick="return doclink('link-140', '_create_flow', 'link-126');">_create_flow</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">)</tt> </tt>
+<a name="L521"></a><tt class="py-lineno">521</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-144" class="py-name"><a title="oauth2client.appengine.OAuth2Decorator._create_flow" class="py-name" href="#" onclick="return doclink('link-144', '_create_flow', 'link-130');">_create_flow</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">)</tt> </tt>
 <a name="L522"></a><tt class="py-lineno">522</tt>  <tt class="py-line"> </tt>
-<a name="L523"></a><tt class="py-lineno">523</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt><tt class="py-op">.</tt><tt class="py-name">params</tt><tt class="py-op">[</tt><tt class="py-string">'state'</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt id="link-141" class="py-name"><a title="oauth2client.appengine._build_state_value" class="py-name" href="#" onclick="return doclink('link-141', '_build_state_value', 'link-127');">_build_state_value</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">)</tt> </tt>
-<a name="L524"></a><tt class="py-lineno">524</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-142" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-142', 'credentials', 'link-85');">credentials</a></tt> <tt class="py-op">=</tt> <tt id="link-143" class="py-name"><a title="oauth2client.appengine.StorageByKeyName" class="py-name" href="#" onclick="return doclink('link-143', 'StorageByKeyName', 'link-129');">StorageByKeyName</a></tt><tt class="py-op">(</tt> </tt>
-<a name="L525"></a><tt class="py-lineno">525</tt>  <tt class="py-line">          <tt id="link-144" class="py-name"><a title="oauth2client.appengine.CredentialsModel" class="py-name" href="#" onclick="return doclink('link-144', 'CredentialsModel', 'link-130');">CredentialsModel</a></tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">.</tt><tt class="py-name">user_id</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-string">'credentials'</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-145" class="py-name"><a title="apiclient.schema.Schemas.get
+<a name="L523"></a><tt class="py-lineno">523</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt><tt class="py-op">.</tt><tt class="py-name">params</tt><tt class="py-op">[</tt><tt class="py-string">'state'</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt id="link-145" class="py-name"><a title="oauth2client.appengine._build_state_value" class="py-name" href="#" onclick="return doclink('link-145', '_build_state_value', 'link-131');">_build_state_value</a></tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">)</tt> </tt>
+<a name="L524"></a><tt class="py-lineno">524</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-146" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-146', 'credentials', 'link-87');">credentials</a></tt> <tt class="py-op">=</tt> <tt id="link-147" class="py-name"><a title="oauth2client.appengine.StorageByKeyName" class="py-name" href="#" onclick="return doclink('link-147', 'StorageByKeyName', 'link-133');">StorageByKeyName</a></tt><tt class="py-op">(</tt> </tt>
+<a name="L525"></a><tt class="py-lineno">525</tt>  <tt class="py-line">          <tt id="link-148" class="py-name"><a title="oauth2client.appengine.CredentialsModel" class="py-name" href="#" onclick="return doclink('link-148', 'CredentialsModel', 'link-134');">CredentialsModel</a></tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">.</tt><tt class="py-name">user_id</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-string">'credentials'</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-149" class="py-name"><a title="apiclient.schema.Schemas.get
 oauth2client.client.MemoryCache.get
-oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-145', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
+oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-149', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L526"></a><tt class="py-lineno">526</tt>  <tt class="py-line">      <tt class="py-keyword">return</tt> <tt class="py-name">method</tt><tt class="py-op">(</tt><tt class="py-name">request_handler</tt><tt class="py-op">,</tt> <tt class="py-op">*</tt><tt class="py-name">args</tt><tt class="py-op">,</tt> <tt class="py-op">**</tt><tt class="py-name">kwargs</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L527"></a><tt class="py-lineno">527</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">setup_oauth</tt> </tt>
 </div><a name="L528"></a><tt class="py-lineno">528</tt>  <tt class="py-line"> </tt>
@@ -711,7 +713,7 @@
 <a name="L532"></a><tt class="py-lineno">532</tt>  <tt class="py-line"><tt class="py-docstring">    Must only be called from with a webapp.RequestHandler subclassed method</tt> </tt>
 <a name="L533"></a><tt class="py-lineno">533</tt>  <tt class="py-line"><tt class="py-docstring">    that had been decorated with either @oauth_required or @oauth_aware.</tt> </tt>
 <a name="L534"></a><tt class="py-lineno">534</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
-<a name="L535"></a><tt class="py-lineno">535</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-146" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-146', 'credentials', 'link-85');">credentials</a></tt> <tt class="py-keyword">is</tt> <tt class="py-keyword">not</tt> <tt class="py-name">None</tt> <tt class="py-keyword">and</tt> <tt class="py-keyword">not</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-147" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-147', 'credentials', 'link-85');">credentials</a></tt><tt class="py-op">.</tt><tt class="py-name">invalid</tt> </tt>
+<a name="L535"></a><tt class="py-lineno">535</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-150" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-150', 'credentials', 'link-87');">credentials</a></tt> <tt class="py-keyword">is</tt> <tt class="py-keyword">not</tt> <tt class="py-name">None</tt> <tt class="py-keyword">and</tt> <tt class="py-keyword">not</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-151" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-151', 'credentials', 'link-87');">credentials</a></tt><tt class="py-op">.</tt><tt class="py-name">invalid</tt> </tt>
 </div><a name="L536"></a><tt class="py-lineno">536</tt>  <tt class="py-line"> </tt>
 <a name="OAuth2Decorator.authorize_url"></a><div id="OAuth2Decorator.authorize_url-def"><a name="L537"></a><tt class="py-lineno">537</tt> <a class="py-toggle" href="#" id="OAuth2Decorator.authorize_url-toggle" onclick="return toggle('OAuth2Decorator.authorize_url');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.OAuth2Decorator-class.html#authorize_url">authorize_url</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="OAuth2Decorator.authorize_url-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="OAuth2Decorator.authorize_url-expanded"><a name="L538"></a><tt class="py-lineno">538</tt>  <tt class="py-line">    <tt class="py-docstring">"""Returns the URL to start the OAuth dance.</tt> </tt>
@@ -719,7 +721,7 @@
 <a name="L540"></a><tt class="py-lineno">540</tt>  <tt class="py-line"><tt class="py-docstring">    Must only be called from with a webapp.RequestHandler subclassed method</tt> </tt>
 <a name="L541"></a><tt class="py-lineno">541</tt>  <tt class="py-line"><tt class="py-docstring">    that had been decorated with either @oauth_required or @oauth_aware.</tt> </tt>
 <a name="L542"></a><tt class="py-lineno">542</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
-<a name="L543"></a><tt class="py-lineno">543</tt>  <tt class="py-line">    <tt class="py-name">url</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt><tt class="py-op">.</tt><tt id="link-148" class="py-name" targets="Method oauth2client.client.OAuth2WebServerFlow.step1_get_authorize_url()=oauth2client.client.OAuth2WebServerFlow-class.html#step1_get_authorize_url"><a title="oauth2client.client.OAuth2WebServerFlow.step1_get_authorize_url" class="py-name" href="#" onclick="return doclink('link-148', 'step1_get_authorize_url', 'link-148');">step1_get_authorize_url</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
+<a name="L543"></a><tt class="py-lineno">543</tt>  <tt class="py-line">    <tt class="py-name">url</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt><tt class="py-op">.</tt><tt id="link-152" class="py-name" targets="Method oauth2client.client.OAuth2WebServerFlow.step1_get_authorize_url()=oauth2client.client.OAuth2WebServerFlow-class.html#step1_get_authorize_url"><a title="oauth2client.client.OAuth2WebServerFlow.step1_get_authorize_url" class="py-name" href="#" onclick="return doclink('link-152', 'step1_get_authorize_url', 'link-152');">step1_get_authorize_url</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L544"></a><tt class="py-lineno">544</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">url</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L545"></a><tt class="py-lineno">545</tt>  <tt class="py-line"> </tt>
 <a name="OAuth2Decorator.http"></a><div id="OAuth2Decorator.http-def"><a name="L546"></a><tt class="py-lineno">546</tt> <a class="py-toggle" href="#" id="OAuth2Decorator.http-toggle" onclick="return toggle('OAuth2Decorator.http');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.OAuth2Decorator-class.html#http">http</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
@@ -729,8 +731,8 @@
 <a name="L550"></a><tt class="py-lineno">550</tt>  <tt class="py-line"><tt class="py-docstring">    from within an @oauth_aware decorated method where has_credentials()</tt> </tt>
 <a name="L551"></a><tt class="py-lineno">551</tt>  <tt class="py-line"><tt class="py-docstring">    returns True.</tt> </tt>
 <a name="L552"></a><tt class="py-lineno">552</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
-<a name="L553"></a><tt class="py-lineno">553</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-149" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-149', 'credentials', 'link-85');">credentials</a></tt><tt class="py-op">.</tt><tt id="link-150" class="py-name" targets="Method oauth2client.client.Credentials.authorize()=oauth2client.client.Credentials-class.html#authorize,Method oauth2client.client.OAuth2Credentials.authorize()=oauth2client.client.OAuth2Credentials-class.html#authorize"><a title="oauth2client.client.Credentials.authorize
-oauth2client.client.OAuth2Credentials.authorize" class="py-name" href="#" onclick="return doclink('link-150', 'authorize', 'link-150');">authorize</a></tt><tt class="py-op">(</tt><tt class="py-name">httplib2</tt><tt class="py-op">.</tt><tt class="py-name">Http</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+<a name="L553"></a><tt class="py-lineno">553</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-153" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-153', 'credentials', 'link-87');">credentials</a></tt><tt class="py-op">.</tt><tt id="link-154" class="py-name" targets="Method oauth2client.client.Credentials.authorize()=oauth2client.client.Credentials-class.html#authorize,Method oauth2client.client.OAuth2Credentials.authorize()=oauth2client.client.OAuth2Credentials-class.html#authorize"><a title="oauth2client.client.Credentials.authorize
+oauth2client.client.OAuth2Credentials.authorize" class="py-name" href="#" onclick="return doclink('link-154', 'authorize', 'link-154');">authorize</a></tt><tt class="py-op">(</tt><tt class="py-name">httplib2</tt><tt class="py-op">.</tt><tt class="py-name">Http</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L554"></a><tt class="py-lineno">554</tt>  <tt class="py-line"> </tt>
 <a name="L555"></a><tt class="py-lineno">555</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">property</tt> </tt>
 <a name="OAuth2Decorator.callback_path"></a><div id="OAuth2Decorator.callback_path-def"><a name="L556"></a><tt class="py-lineno">556</tt> <a class="py-toggle" href="#" id="OAuth2Decorator.callback_path-toggle" onclick="return toggle('OAuth2Decorator.callback_path');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.OAuth2Decorator-class.html#callback_path">callback_path</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
@@ -767,37 +769,37 @@
 <a name="L587"></a><tt class="py-lineno">587</tt>  <tt class="py-line"> </tt>
 <a name="L588"></a><tt class="py-lineno">588</tt>  <tt class="py-line">      <tt class="py-decorator">@</tt><tt class="py-decorator">login_required</tt> </tt>
 <a name="L589"></a><tt class="py-lineno">589</tt>  <tt class="py-line">      <tt class="py-keyword">def</tt> <tt class="py-def-name">get</tt><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
-<a name="L590"></a><tt class="py-lineno">590</tt>  <tt class="py-line">        <tt class="py-name">error</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-151" class="py-name"><a title="apiclient.http.HttpMock.request
+<a name="L590"></a><tt class="py-lineno">590</tt>  <tt class="py-line">        <tt class="py-name">error</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-155" class="py-name"><a title="apiclient.http.HttpMock.request
 apiclient.http.HttpMockSequence.request
 apiclient.model.BaseModel.request
-apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-151', 'request', 'link-111');">request</a></tt><tt class="py-op">.</tt><tt id="link-152" class="py-name"><a title="apiclient.schema.Schemas.get
+apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-155', 'request', 'link-113');">request</a></tt><tt class="py-op">.</tt><tt id="link-156" class="py-name"><a title="apiclient.schema.Schemas.get
 oauth2client.client.MemoryCache.get
-oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-152', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'error'</tt><tt class="py-op">)</tt> </tt>
+oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-156', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'error'</tt><tt class="py-op">)</tt> </tt>
 <a name="L591"></a><tt class="py-lineno">591</tt>  <tt class="py-line">        <tt class="py-keyword">if</tt> <tt class="py-name">error</tt><tt class="py-op">:</tt> </tt>
-<a name="L592"></a><tt class="py-lineno">592</tt>  <tt class="py-line">          <tt class="py-name">errormsg</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-153" class="py-name"><a title="apiclient.http.HttpMock.request
+<a name="L592"></a><tt class="py-lineno">592</tt>  <tt class="py-line">          <tt class="py-name">errormsg</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-157" class="py-name"><a title="apiclient.http.HttpMock.request
 apiclient.http.HttpMockSequence.request
 apiclient.model.BaseModel.request
-apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-153', 'request', 'link-111');">request</a></tt><tt class="py-op">.</tt><tt id="link-154" class="py-name"><a title="apiclient.schema.Schemas.get
+apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-157', 'request', 'link-113');">request</a></tt><tt class="py-op">.</tt><tt id="link-158" class="py-name"><a title="apiclient.schema.Schemas.get
 oauth2client.client.MemoryCache.get
-oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-154', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'error_description'</tt><tt class="py-op">,</tt> <tt class="py-name">error</tt><tt class="py-op">)</tt> </tt>
-<a name="L593"></a><tt class="py-lineno">593</tt>  <tt class="py-line">          <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-155" class="py-name"><a title="apiclient.model.BaseModel.response
-apiclient.model.Model.response" class="py-name" href="#" onclick="return doclink('link-155', 'response', 'link-120');">response</a></tt><tt class="py-op">.</tt><tt class="py-name">out</tt><tt class="py-op">.</tt><tt class="py-name">write</tt><tt class="py-op">(</tt> </tt>
-<a name="L594"></a><tt class="py-lineno">594</tt>  <tt class="py-line">              <tt class="py-string">'The authorization request failed: %s'</tt> <tt class="py-op">%</tt> <tt id="link-156" class="py-name"><a title="oauth2client.appengine._safe_html" class="py-name" href="#" onclick="return doclink('link-156', '_safe_html', 'link-122');">_safe_html</a></tt><tt class="py-op">(</tt><tt class="py-name">errormsg</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-158', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'error_description'</tt><tt class="py-op">,</tt> <tt class="py-name">error</tt><tt class="py-op">)</tt> </tt>
+<a name="L593"></a><tt class="py-lineno">593</tt>  <tt class="py-line">          <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-159" class="py-name"><a title="apiclient.model.BaseModel.response
+apiclient.model.Model.response" class="py-name" href="#" onclick="return doclink('link-159', 'response', 'link-124');">response</a></tt><tt class="py-op">.</tt><tt class="py-name">out</tt><tt class="py-op">.</tt><tt class="py-name">write</tt><tt class="py-op">(</tt> </tt>
+<a name="L594"></a><tt class="py-lineno">594</tt>  <tt class="py-line">              <tt class="py-string">'The authorization request failed: %s'</tt> <tt class="py-op">%</tt> <tt id="link-160" class="py-name"><a title="oauth2client.appengine._safe_html" class="py-name" href="#" onclick="return doclink('link-160', '_safe_html', 'link-126');">_safe_html</a></tt><tt class="py-op">(</tt><tt class="py-name">errormsg</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L595"></a><tt class="py-lineno">595</tt>  <tt class="py-line">        <tt class="py-keyword">else</tt><tt class="py-op">:</tt> </tt>
 <a name="L596"></a><tt class="py-lineno">596</tt>  <tt class="py-line">          <tt class="py-name">user</tt> <tt class="py-op">=</tt> <tt class="py-name">users</tt><tt class="py-op">.</tt><tt class="py-name">get_current_user</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
-<a name="L597"></a><tt class="py-lineno">597</tt>  <tt class="py-line">          <tt class="py-name">decorator</tt><tt class="py-op">.</tt><tt id="link-157" class="py-name"><a title="oauth2client.appengine.OAuth2Decorator._create_flow" class="py-name" href="#" onclick="return doclink('link-157', '_create_flow', 'link-126');">_create_flow</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">)</tt> </tt>
-<a name="L598"></a><tt class="py-lineno">598</tt>  <tt class="py-line">          <tt id="link-158" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-158', 'credentials', 'link-85');">credentials</a></tt> <tt class="py-op">=</tt> <tt class="py-name">decorator</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt><tt class="py-op">.</tt><tt id="link-159" class="py-name" targets="Method oauth2client.client.OAuth2WebServerFlow.step2_exchange()=oauth2client.client.OAuth2WebServerFlow-class.html#step2_exchange"><a title="oauth2client.client.OAuth2WebServerFlow.step2_exchange" class="py-name" href="#" onclick="return doclink('link-159', 'step2_exchange', 'link-159');">step2_exchange</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-160" class="py-name"><a title="apiclient.http.HttpMock.request
+<a name="L597"></a><tt class="py-lineno">597</tt>  <tt class="py-line">          <tt class="py-name">decorator</tt><tt class="py-op">.</tt><tt id="link-161" class="py-name"><a title="oauth2client.appengine.OAuth2Decorator._create_flow" class="py-name" href="#" onclick="return doclink('link-161', '_create_flow', 'link-130');">_create_flow</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">)</tt> </tt>
+<a name="L598"></a><tt class="py-lineno">598</tt>  <tt class="py-line">          <tt id="link-162" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-162', 'credentials', 'link-87');">credentials</a></tt> <tt class="py-op">=</tt> <tt class="py-name">decorator</tt><tt class="py-op">.</tt><tt class="py-name">flow</tt><tt class="py-op">.</tt><tt id="link-163" class="py-name" targets="Method oauth2client.client.OAuth2WebServerFlow.step2_exchange()=oauth2client.client.OAuth2WebServerFlow-class.html#step2_exchange"><a title="oauth2client.client.OAuth2WebServerFlow.step2_exchange" class="py-name" href="#" onclick="return doclink('link-163', 'step2_exchange', 'link-163');">step2_exchange</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-164" class="py-name"><a title="apiclient.http.HttpMock.request
 apiclient.http.HttpMockSequence.request
 apiclient.model.BaseModel.request
-apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-160', 'request', 'link-111');">request</a></tt><tt class="py-op">.</tt><tt class="py-name">params</tt><tt class="py-op">)</tt> </tt>
-<a name="L599"></a><tt class="py-lineno">599</tt>  <tt class="py-line">          <tt id="link-161" class="py-name"><a title="oauth2client.appengine.StorageByKeyName" class="py-name" href="#" onclick="return doclink('link-161', 'StorageByKeyName', 'link-129');">StorageByKeyName</a></tt><tt class="py-op">(</tt> </tt>
-<a name="L600"></a><tt class="py-lineno">600</tt>  <tt class="py-line">              <tt id="link-162" class="py-name"><a title="oauth2client.appengine.CredentialsModel" class="py-name" href="#" onclick="return doclink('link-162', 'CredentialsModel', 'link-130');">CredentialsModel</a></tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">.</tt><tt class="py-name">user_id</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-string">'credentials'</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-163" class="py-name"><a title="oauth2client.client.Storage.put" class="py-name" href="#" onclick="return doclink('link-163', 'put', 'link-56');">put</a></tt><tt class="py-op">(</tt><tt id="link-164" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-164', 'credentials', 'link-85');">credentials</a></tt><tt class="py-op">)</tt> </tt>
-<a name="L601"></a><tt class="py-lineno">601</tt>  <tt class="py-line">          <tt class="py-name">redirect_uri</tt> <tt class="py-op">=</tt> <tt id="link-165" class="py-name" targets="Function oauth2client.appengine._parse_state_value()=oauth2client.appengine-module.html#_parse_state_value"><a title="oauth2client.appengine._parse_state_value" class="py-name" href="#" onclick="return doclink('link-165', '_parse_state_value', 'link-165');">_parse_state_value</a></tt><tt class="py-op">(</tt><tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-166" class="py-name"><a title="apiclient.http.HttpMock.request
+apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-164', 'request', 'link-113');">request</a></tt><tt class="py-op">.</tt><tt class="py-name">params</tt><tt class="py-op">)</tt> </tt>
+<a name="L599"></a><tt class="py-lineno">599</tt>  <tt class="py-line">          <tt id="link-165" class="py-name"><a title="oauth2client.appengine.StorageByKeyName" class="py-name" href="#" onclick="return doclink('link-165', 'StorageByKeyName', 'link-133');">StorageByKeyName</a></tt><tt class="py-op">(</tt> </tt>
+<a name="L600"></a><tt class="py-lineno">600</tt>  <tt class="py-line">              <tt id="link-166" class="py-name"><a title="oauth2client.appengine.CredentialsModel" class="py-name" href="#" onclick="return doclink('link-166', 'CredentialsModel', 'link-134');">CredentialsModel</a></tt><tt class="py-op">,</tt> <tt class="py-name">user</tt><tt class="py-op">.</tt><tt class="py-name">user_id</tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> <tt class="py-string">'credentials'</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-167" class="py-name"><a title="oauth2client.client.Storage.put" class="py-name" href="#" onclick="return doclink('link-167', 'put', 'link-56');">put</a></tt><tt class="py-op">(</tt><tt id="link-168" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-168', 'credentials', 'link-87');">credentials</a></tt><tt class="py-op">)</tt> </tt>
+<a name="L601"></a><tt class="py-lineno">601</tt>  <tt class="py-line">          <tt class="py-name">redirect_uri</tt> <tt class="py-op">=</tt> <tt id="link-169" class="py-name" targets="Function oauth2client.appengine._parse_state_value()=oauth2client.appengine-module.html#_parse_state_value"><a title="oauth2client.appengine._parse_state_value" class="py-name" href="#" onclick="return doclink('link-169', '_parse_state_value', 'link-169');">_parse_state_value</a></tt><tt class="py-op">(</tt><tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-170" class="py-name"><a title="apiclient.http.HttpMock.request
 apiclient.http.HttpMockSequence.request
 apiclient.model.BaseModel.request
-apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-166', 'request', 'link-111');">request</a></tt><tt class="py-op">.</tt><tt id="link-167" class="py-name"><a title="apiclient.schema.Schemas.get
+apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-170', 'request', 'link-113');">request</a></tt><tt class="py-op">.</tt><tt id="link-171" class="py-name"><a title="apiclient.schema.Schemas.get
 oauth2client.client.MemoryCache.get
-oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-167', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'state'</tt><tt class="py-op">)</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> </tt>
+oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-171', 'get', 'link-44');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'state'</tt><tt class="py-op">)</tt><tt class="py-op">)</tt><tt class="py-op">,</tt> </tt>
 <a name="L602"></a><tt class="py-lineno">602</tt>  <tt class="py-line">                                            <tt class="py-name">user</tt><tt class="py-op">)</tt> </tt>
 <a name="L603"></a><tt class="py-lineno">603</tt>  <tt class="py-line">          <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">redirect</tt><tt class="py-op">(</tt><tt class="py-name">redirect_uri</tt><tt class="py-op">)</tt> </tt>
 </div></div><a name="L604"></a><tt class="py-lineno">604</tt>  <tt class="py-line"> </tt>
@@ -814,7 +816,7 @@
 <a name="L615"></a><tt class="py-lineno">615</tt>  <tt class="py-line"><tt class="py-docstring">      server during the OAuth 2.0 dance.</tt> </tt>
 <a name="L616"></a><tt class="py-lineno">616</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
 <a name="L617"></a><tt class="py-lineno">617</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">webapp</tt><tt class="py-op">.</tt><tt class="py-name">WSGIApplication</tt><tt class="py-op">(</tt><tt class="py-op">[</tt> </tt>
-<a name="L618"></a><tt class="py-lineno">618</tt>  <tt class="py-line">        <tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-168" class="py-name"><a title="oauth2client.appengine.OAuth2Decorator.callback_path" class="py-name" href="#" onclick="return doclink('link-168', 'callback_path', 'link-119');">callback_path</a></tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-169" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator.callback_handler()=oauth2client.appengine.OAuth2Decorator-class.html#callback_handler"><a title="oauth2client.appengine.OAuth2Decorator.callback_handler" class="py-name" href="#" onclick="return doclink('link-169', 'callback_handler', 'link-169');">callback_handler</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+<a name="L618"></a><tt class="py-lineno">618</tt>  <tt class="py-line">        <tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-172" class="py-name"><a title="oauth2client.appengine.OAuth2Decorator.callback_path" class="py-name" href="#" onclick="return doclink('link-172', 'callback_path', 'link-123');">callback_path</a></tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-173" class="py-name" targets="Method oauth2client.appengine.OAuth2Decorator.callback_handler()=oauth2client.appengine.OAuth2Decorator-class.html#callback_handler"><a title="oauth2client.appengine.OAuth2Decorator.callback_handler" class="py-name" href="#" onclick="return doclink('link-173', 'callback_handler', 'link-173');">callback_handler</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L619"></a><tt class="py-lineno">619</tt>  <tt class="py-line">        <tt class="py-op">]</tt><tt class="py-op">)</tt> </tt>
 </div></div><a name="L620"></a><tt class="py-lineno">620</tt>  <tt class="py-line"> </tt>
 <a name="OAuth2DecoratorFromClientSecrets"></a><div id="OAuth2DecoratorFromClientSecrets-def"><a name="L621"></a><tt class="py-lineno">621</tt>  <tt class="py-line"> </tt>
@@ -840,7 +842,7 @@
 <a name="L641"></a><tt class="py-lineno">641</tt>  <tt class="py-line"><tt class="py-docstring">        # in API calls</tt> </tt>
 <a name="L642"></a><tt class="py-lineno">642</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
 <a name="L643"></a><tt class="py-lineno">643</tt>  <tt class="py-line"> </tt>
-<a name="L644"></a><tt class="py-lineno">644</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-170" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-170', 'positional', 'link-65');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">3</tt><tt class="py-op">)</tt> </tt>
+<a name="L644"></a><tt class="py-lineno">644</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-174" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-174', 'positional', 'link-65');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">3</tt><tt class="py-op">)</tt> </tt>
 <a name="OAuth2DecoratorFromClientSecrets.__init__"></a><div id="OAuth2DecoratorFromClientSecrets.__init__-def"><a name="L645"></a><tt class="py-lineno">645</tt> <a class="py-toggle" href="#" id="OAuth2DecoratorFromClientSecrets.__init__-toggle" onclick="return toggle('OAuth2DecoratorFromClientSecrets.__init__');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html#__init__">__init__</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">filename</tt><tt class="py-op">,</tt> <tt class="py-param">scope</tt><tt class="py-op">,</tt> <tt class="py-param">message</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">,</tt> <tt class="py-param">cache</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="OAuth2DecoratorFromClientSecrets.__init__-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="OAuth2DecoratorFromClientSecrets.__init__-expanded"><a name="L646"></a><tt class="py-lineno">646</tt>  <tt class="py-line">    <tt class="py-docstring">"""Constructor</tt> </tt>
 <a name="L647"></a><tt class="py-lineno">647</tt>  <tt class="py-line"><tt class="py-docstring"></tt> </tt>
@@ -855,14 +857,14 @@
 <a name="L656"></a><tt class="py-lineno">656</tt>  <tt class="py-line"><tt class="py-docstring">      cache: An optional cache service client that implements get() and set()</tt> </tt>
 <a name="L657"></a><tt class="py-lineno">657</tt>  <tt class="py-line"><tt class="py-docstring">        methods. See clientsecrets.loadfile() for details.</tt> </tt>
 <a name="L658"></a><tt class="py-lineno">658</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
-<a name="L659"></a><tt class="py-lineno">659</tt>  <tt class="py-line">    <tt class="py-name">client_type</tt><tt class="py-op">,</tt> <tt class="py-name">client_info</tt> <tt class="py-op">=</tt> <tt id="link-171" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-171', 'clientsecrets', 'link-14');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-172" class="py-name" targets="Function oauth2client.clientsecrets.loadfile()=oauth2client.clientsecrets-module.html#loadfile"><a title="oauth2client.clientsecrets.loadfile" class="py-name" href="#" onclick="return doclink('link-172', 'loadfile', 'link-172');">loadfile</a></tt><tt class="py-op">(</tt><tt id="link-173" class="py-name" targets="Method oauth2client.locked_file.LockedFile.filename()=oauth2client.locked_file.LockedFile-class.html#filename,Method oauth2client.locked_file._Opener.filename()=oauth2client.locked_file._Opener-class.html#filename"><a title="oauth2client.locked_file.LockedFile.filename
-oauth2client.locked_file._Opener.filename" class="py-name" href="#" onclick="return doclink('link-173', 'filename', 'link-173');">filename</a></tt><tt class="py-op">,</tt> <tt class="py-name">cache</tt><tt class="py-op">=</tt><tt class="py-name">cache</tt><tt class="py-op">)</tt> </tt>
+<a name="L659"></a><tt class="py-lineno">659</tt>  <tt class="py-line">    <tt class="py-name">client_type</tt><tt class="py-op">,</tt> <tt class="py-name">client_info</tt> <tt class="py-op">=</tt> <tt id="link-175" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-175', 'clientsecrets', 'link-14');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-176" class="py-name" targets="Function oauth2client.clientsecrets.loadfile()=oauth2client.clientsecrets-module.html#loadfile"><a title="oauth2client.clientsecrets.loadfile" class="py-name" href="#" onclick="return doclink('link-176', 'loadfile', 'link-176');">loadfile</a></tt><tt class="py-op">(</tt><tt id="link-177" class="py-name" targets="Method oauth2client.locked_file.LockedFile.filename()=oauth2client.locked_file.LockedFile-class.html#filename,Method oauth2client.locked_file._Opener.filename()=oauth2client.locked_file._Opener-class.html#filename"><a title="oauth2client.locked_file.LockedFile.filename
+oauth2client.locked_file._Opener.filename" class="py-name" href="#" onclick="return doclink('link-177', 'filename', 'link-177');">filename</a></tt><tt class="py-op">,</tt> <tt class="py-name">cache</tt><tt class="py-op">=</tt><tt class="py-name">cache</tt><tt class="py-op">)</tt> </tt>
 <a name="L660"></a><tt class="py-lineno">660</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">client_type</tt> <tt class="py-keyword">not</tt> <tt class="py-keyword">in</tt> <tt class="py-op">[</tt> </tt>
-<a name="L661"></a><tt class="py-lineno">661</tt>  <tt class="py-line">        <tt id="link-174" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-174', 'clientsecrets', 'link-14');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-175" class="py-name" targets="Variable oauth2client.clientsecrets.TYPE_WEB=oauth2client.clientsecrets-module.html#TYPE_WEB"><a title="oauth2client.clientsecrets.TYPE_WEB" class="py-name" href="#" onclick="return doclink('link-175', 'TYPE_WEB', 'link-175');">TYPE_WEB</a></tt><tt class="py-op">,</tt> <tt id="link-176" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-176', 'clientsecrets', 'link-14');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-177" class="py-name" targets="Variable oauth2client.clientsecrets.TYPE_INSTALLED=oauth2client.clientsecrets-module.html#TYPE_INSTALLED"><a title="oauth2client.clientsecrets.TYPE_INSTALLED" class="py-name" href="#" onclick="return doclink('link-177', 'TYPE_INSTALLED', 'link-177');">TYPE_INSTALLED</a></tt><tt class="py-op">]</tt><tt class="py-op">:</tt> </tt>
-<a name="L662"></a><tt class="py-lineno">662</tt>  <tt class="py-line">      <tt class="py-keyword">raise</tt> <tt id="link-178" class="py-name" targets="Class oauth2client.appengine.InvalidClientSecretsError=oauth2client.appengine.InvalidClientSecretsError-class.html,Class oauth2client.clientsecrets.InvalidClientSecretsError=oauth2client.clientsecrets.InvalidClientSecretsError-class.html"><a title="oauth2client.appengine.InvalidClientSecretsError
-oauth2client.clientsecrets.InvalidClientSecretsError" class="py-name" href="#" onclick="return doclink('link-178', 'InvalidClientSecretsError', 'link-178');">InvalidClientSecretsError</a></tt><tt class="py-op">(</tt> </tt>
+<a name="L661"></a><tt class="py-lineno">661</tt>  <tt class="py-line">        <tt id="link-178" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-178', 'clientsecrets', 'link-14');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-179" class="py-name" targets="Variable oauth2client.clientsecrets.TYPE_WEB=oauth2client.clientsecrets-module.html#TYPE_WEB"><a title="oauth2client.clientsecrets.TYPE_WEB" class="py-name" href="#" onclick="return doclink('link-179', 'TYPE_WEB', 'link-179');">TYPE_WEB</a></tt><tt class="py-op">,</tt> <tt id="link-180" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-180', 'clientsecrets', 'link-14');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-181" class="py-name" targets="Variable oauth2client.clientsecrets.TYPE_INSTALLED=oauth2client.clientsecrets-module.html#TYPE_INSTALLED"><a title="oauth2client.clientsecrets.TYPE_INSTALLED" class="py-name" href="#" onclick="return doclink('link-181', 'TYPE_INSTALLED', 'link-181');">TYPE_INSTALLED</a></tt><tt class="py-op">]</tt><tt class="py-op">:</tt> </tt>
+<a name="L662"></a><tt class="py-lineno">662</tt>  <tt class="py-line">      <tt class="py-keyword">raise</tt> <tt id="link-182" class="py-name" targets="Class oauth2client.appengine.InvalidClientSecretsError=oauth2client.appengine.InvalidClientSecretsError-class.html,Class oauth2client.clientsecrets.InvalidClientSecretsError=oauth2client.clientsecrets.InvalidClientSecretsError-class.html"><a title="oauth2client.appengine.InvalidClientSecretsError
+oauth2client.clientsecrets.InvalidClientSecretsError" class="py-name" href="#" onclick="return doclink('link-182', 'InvalidClientSecretsError', 'link-182');">InvalidClientSecretsError</a></tt><tt class="py-op">(</tt> </tt>
 <a name="L663"></a><tt class="py-lineno">663</tt>  <tt class="py-line">          <tt class="py-string">'OAuth2Decorator doesn\'t support this OAuth 2.0 flow.'</tt><tt class="py-op">)</tt> </tt>
-<a name="L664"></a><tt class="py-lineno">664</tt>  <tt class="py-line">    <tt class="py-name">super</tt><tt class="py-op">(</tt><tt id="link-179" class="py-name" targets="Class oauth2client.appengine.OAuth2DecoratorFromClientSecrets=oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html"><a title="oauth2client.appengine.OAuth2DecoratorFromClientSecrets" class="py-name" href="#" onclick="return doclink('link-179', 'OAuth2DecoratorFromClientSecrets', 'link-179');">OAuth2DecoratorFromClientSecrets</a></tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-180" class="py-name"><a title="apiclient.errors.BatchError.__init__
+<a name="L664"></a><tt class="py-lineno">664</tt>  <tt class="py-line">    <tt class="py-name">super</tt><tt class="py-op">(</tt><tt id="link-183" class="py-name" targets="Class oauth2client.appengine.OAuth2DecoratorFromClientSecrets=oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html"><a title="oauth2client.appengine.OAuth2DecoratorFromClientSecrets" class="py-name" href="#" onclick="return doclink('link-183', 'OAuth2DecoratorFromClientSecrets', 'link-183');">OAuth2DecoratorFromClientSecrets</a></tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">)</tt><tt class="py-op">.</tt><tt id="link-184" class="py-name"><a title="apiclient.errors.BatchError.__init__
 apiclient.errors.HttpError.__init__
 apiclient.errors.UnexpectedBodyError.__init__
 apiclient.errors.UnexpectedMethodError.__init__
@@ -904,7 +906,7 @@
 oauth2client.locked_file.LockedFile.__init__
 oauth2client.locked_file._Opener.__init__
 oauth2client.multistore_file._MultiStore._Storage.__init__
-oauth2client.multistore_file._MultiStore.__init__" class="py-name" href="#" onclick="return doclink('link-180', '__init__', 'link-67');">__init__</a></tt><tt class="py-op">(</tt> </tt>
+oauth2client.multistore_file._MultiStore.__init__" class="py-name" href="#" onclick="return doclink('link-184', '__init__', 'link-67');">__init__</a></tt><tt class="py-op">(</tt> </tt>
 <a name="L665"></a><tt class="py-lineno">665</tt>  <tt class="py-line">              <tt class="py-name">client_info</tt><tt class="py-op">[</tt><tt class="py-string">'client_id'</tt><tt class="py-op">]</tt><tt class="py-op">,</tt> </tt>
 <a name="L666"></a><tt class="py-lineno">666</tt>  <tt class="py-line">              <tt class="py-name">client_info</tt><tt class="py-op">[</tt><tt class="py-string">'client_secret'</tt><tt class="py-op">]</tt><tt class="py-op">,</tt> </tt>
 <a name="L667"></a><tt class="py-lineno">667</tt>  <tt class="py-line">              <tt class="py-name">scope</tt><tt class="py-op">,</tt> </tt>
@@ -917,7 +919,7 @@
 <a name="L674"></a><tt class="py-lineno">674</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_message</tt> <tt class="py-op">=</tt> <tt class="py-string">"Please configure your application for OAuth 2.0"</tt> </tt>
 </div></div><a name="L675"></a><tt class="py-lineno">675</tt>  <tt class="py-line"> </tt>
 <a name="oauth2decorator_from_clientsecrets"></a><div id="oauth2decorator_from_clientsecrets-def"><a name="L676"></a><tt class="py-lineno">676</tt>  <tt class="py-line"> </tt>
-<a name="L677"></a><tt class="py-lineno">677</tt>  <tt class="py-line"><tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-181" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-181', 'positional', 'link-65');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">2</tt><tt class="py-op">)</tt> </tt>
+<a name="L677"></a><tt class="py-lineno">677</tt>  <tt class="py-line"><tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-185" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-185', 'positional', 'link-65');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">2</tt><tt class="py-op">)</tt> </tt>
 <a name="L678"></a><tt class="py-lineno">678</tt> <a class="py-toggle" href="#" id="oauth2decorator_from_clientsecrets-toggle" onclick="return toggle('oauth2decorator_from_clientsecrets');">-</a><tt class="py-line"><tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.appengine-module.html#oauth2decorator_from_clientsecrets">oauth2decorator_from_clientsecrets</a><tt class="py-op">(</tt><tt class="py-param">filename</tt><tt class="py-op">,</tt> <tt class="py-param">scope</tt><tt class="py-op">,</tt> </tt>
 <a name="L679"></a><tt class="py-lineno">679</tt>  <tt class="py-line">                                       <tt class="py-param">message</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">,</tt> <tt class="py-param">cache</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="oauth2decorator_from_clientsecrets-collapsed" style="display:none;" pad="+++" indent="++++"></div><div id="oauth2decorator_from_clientsecrets-expanded"><a name="L680"></a><tt class="py-lineno">680</tt>  <tt class="py-line">  <tt class="py-docstring">"""Creates an OAuth2Decorator populated from a clientsecrets file.</tt> </tt>
@@ -936,8 +938,8 @@
 <a name="L693"></a><tt class="py-lineno">693</tt>  <tt class="py-line"><tt class="py-docstring">  Returns: An OAuth2Decorator</tt> </tt>
 <a name="L694"></a><tt class="py-lineno">694</tt>  <tt class="py-line"><tt class="py-docstring"></tt> </tt>
 <a name="L695"></a><tt class="py-lineno">695</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
-<a name="L696"></a><tt class="py-lineno">696</tt>  <tt class="py-line">  <tt class="py-keyword">return</tt> <tt id="link-182" class="py-name"><a title="oauth2client.appengine.OAuth2DecoratorFromClientSecrets" class="py-name" href="#" onclick="return doclink('link-182', 'OAuth2DecoratorFromClientSecrets', 'link-179');">OAuth2DecoratorFromClientSecrets</a></tt><tt class="py-op">(</tt><tt id="link-183" class="py-name"><a title="oauth2client.locked_file.LockedFile.filename
-oauth2client.locked_file._Opener.filename" class="py-name" href="#" onclick="return doclink('link-183', 'filename', 'link-173');">filename</a></tt><tt class="py-op">,</tt> <tt class="py-name">scope</tt><tt class="py-op">,</tt> </tt>
+<a name="L696"></a><tt class="py-lineno">696</tt>  <tt class="py-line">  <tt class="py-keyword">return</tt> <tt id="link-186" class="py-name"><a title="oauth2client.appengine.OAuth2DecoratorFromClientSecrets" class="py-name" href="#" onclick="return doclink('link-186', 'OAuth2DecoratorFromClientSecrets', 'link-183');">OAuth2DecoratorFromClientSecrets</a></tt><tt class="py-op">(</tt><tt id="link-187" class="py-name"><a title="oauth2client.locked_file.LockedFile.filename
+oauth2client.locked_file._Opener.filename" class="py-name" href="#" onclick="return doclink('link-187', 'filename', 'link-177');">filename</a></tt><tt class="py-op">,</tt> <tt class="py-name">scope</tt><tt class="py-op">,</tt> </tt>
 <a name="L697"></a><tt class="py-lineno">697</tt>  <tt class="py-line">    <tt class="py-name">message</tt><tt class="py-op">=</tt><tt class="py-name">message</tt><tt class="py-op">,</tt> <tt class="py-name">cache</tt><tt class="py-op">=</tt><tt class="py-name">cache</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L698"></a><tt class="py-lineno">698</tt>  <tt class="py-line"> </tt><script type="text/javascript">
 <!--
@@ -969,7 +971,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine.AppAssertionCredentials-class.html b/docs/epy/oauth2client.appengine.AppAssertionCredentials-class.html
index 8cc28f5..cb7f409 100644
--- a/docs/epy/oauth2client.appengine.AppAssertionCredentials-class.html
+++ b/docs/epy/oauth2client.appengine.AppAssertionCredentials-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class AppAssertionCredentials</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.appengine-pysrc.html#AppAssertionCredentials">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_appasserti" name="class_hierarchy_for_appasserti">
-<area shape="rect" href="oauth2client.appengine.AppAssertionCredentials-class.html" title="AppAssertionCredentials" alt="" coords="12,173,175,200"/>
-<area shape="rect" href="oauth2client.client.AssertionCredentials-class.html" title="client.AssertionCredentials" alt="" coords="5,117,181,144"/>
-<area shape="rect" href="oauth2client.client.Credentials-class.html" title="client.Credentials" alt="" coords="33,5,153,32"/>
-<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="client.OAuth2Credentials" alt="" coords="11,61,176,88"/>
+<area shape="rect" href="oauth2client.appengine.AppAssertionCredentials-class.html" title="AppAssertionCredentials" alt="" coords="5,5,168,32"/>
+<area shape="rect" href="oauth2client.client.AssertionCredentials-class.html" title="client.AssertionCredentials" alt="" coords="192,5,368,32"/>
+<area shape="rect" href="oauth2client.client.Credentials-class.html" title="client.Credentials" alt="" coords="392,5,512,32"/>
+<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="client.OAuth2Credentials" alt="" coords="536,5,701,32"/>
 </map>
   <img src="class_hierarchy_for_appasserti.gif" alt='' usemap="#class_hierarchy_for_appasserti" ismap="ismap" class="graph-without-title" />
 </center>
@@ -102,11 +102,12 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.appengine.AppAssertionCredentials-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">*args</span>,
+          <td><span class="summary-sig"><a href="oauth2client.appengine.AppAssertionCredentials-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">scope</span>,
         <span class="summary-sig-arg">**kwargs</span>)</span><br />
       Constructor for AppAssertionCredentials</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.appengine-pysrc.html#AppAssertionCredentials.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -141,6 +142,7 @@
     <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.client.OAuth2Credentials-class.html">client.OAuth2Credentials</a></code></b>:
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#__getstate__">__getstate__</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#__setstate__">__setstate__</a></code>,
+      <code><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#apply">apply</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#authorize">authorize</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#refresh">refresh</a></code>,
@@ -259,9 +261,6 @@
 </tr>
   <tr>
     <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.client.OAuth2Credentials-class.html">client.OAuth2Credentials</a></code></b>:
-      <code><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a></code>
-      </p>
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
       <code>__class__</code>
       </p>
@@ -293,12 +292,13 @@
 <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">*args</span>,
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">scope</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="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.appengine-pysrc.html#AppAssertionCredentials.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -417,7 +417,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine.CredentialsModel-class.html b/docs/epy/oauth2client.appengine.CredentialsModel-class.html
index 039f1f4..e5f0e7f 100644
--- a/docs/epy/oauth2client.appengine.CredentialsModel-class.html
+++ b/docs/epy/oauth2client.appengine.CredentialsModel-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_credential" name="class_hierarchy_for_credential">
 <area shape="rect" href="javascript:void(0);" title="google.appengine.ext.db.Model" alt="" coords="5,5,205,32"/>
-<area shape="rect" href="oauth2client.appengine.CredentialsModel-class.html" title="CredentialsModel" alt="" coords="45,61,165,88"/>
+<area shape="rect" href="oauth2client.appengine.CredentialsModel-class.html" title="CredentialsModel" alt="" coords="229,5,349,32"/>
 </map>
   <img src="class_hierarchy_for_credential.gif" alt='' usemap="#class_hierarchy_for_credential" ismap="ismap" class="graph-without-title" />
 </center>
@@ -116,6 +116,7 @@
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>google.appengine.ext.db.Model</code></b>:
       <code>__init__</code>,
+      <code>__new__</code>,
       <code>delete</code>,
       <code>dynamic_properties</code>,
       <code>has_key</code>,
@@ -187,31 +188,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 colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code>google.appengine.ext.db.Model</code></b>:
-      <code>__new__</code>
-      </p>
-    </td>
-  </tr>
-</table>
 <!-- ==================== CLASS VARIABLES ==================== -->
 <a name="section-ClassVariables"></a>
 <table class="summary" border="1" cellpadding="3"
@@ -236,28 +212,6 @@
         <a name="credentials"></a><span class="summary-name">credentials</span> = <code title="CredentialsProperty()">CredentialsProperty()</code>
     </td>
   </tr>
-<tr class="private">
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="_all_properties"></a><span class="summary-name">_all_properties</span> = <code title="frozenset(['credentials'])"><code class="variable-group">frozenset([</code><code class="variable-quote">'</code><code class="variable-string">credentials</code><code class="variable-quote">'</code><code class="variable-group">])</code></code>
-    </td>
-  </tr>
-<tr class="private">
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a href="oauth2client.appengine.CredentialsModel-class.html#_properties" class="summary-name" onclick="show_private();">_properties</a> = <code title="{'credentials': &lt;oauth2client.appengine.CredentialsProperty object at \
-0x1e8dbd0&gt;}"><code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">credentials</code><code class="variable-quote">'</code><code class="variable-op">: </code>&lt;oauth2client.appengine.Credenti<code class="variable-ellipsis">...</code></code>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" class="summary">
-    <div class="private">    <p class="indent-wrapped-lines"><b>Inherited from <code>google.appengine.ext.db.Model</code></b> (private):
-      <code>_unindexed_properties</code>
-      </p></div>
-    </td>
-  </tr>
 </table>
 <!-- ==================== PROPERTIES ==================== -->
 <a name="section-Properties"></a>
@@ -284,44 +238,6 @@
     </td>
   </tr>
 </table>
-<!-- ==================== CLASS VARIABLE DETAILS ==================== -->
-<a name="section-ClassVariableDetails"></a>
-<table class="details" 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">Class Variable Details</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-ClassVariableDetails"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
-<a name="_properties"></a>
-<div class="private">
-<table class="details" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
-  <h3 class="epydoc">_properties</h3>
-  
-  <dl class="fields">
-  </dl>
-  <dl class="fields">
-    <dt>Value:</dt>
-      <dd><table><tr><td><pre class="variable">
-<code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">credentials</code><code class="variable-quote">'</code><code class="variable-op">: </code>&lt;oauth2client.appengine.CredentialsProperty object at <span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
-0x1e8dbd0&gt;<code class="variable-group">}</code>
-</pre></td></tr></table>
-</dd>
-  </dl>
-</td></tr></table>
-</div>
-<br />
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -345,7 +261,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine.CredentialsProperty-class.html b/docs/epy/oauth2client.appengine.CredentialsProperty-class.html
index 73f3243..fc93771 100644
--- a/docs/epy/oauth2client.appengine.CredentialsProperty-class.html
+++ b/docs/epy/oauth2client.appengine.CredentialsProperty-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_credential_2" name="class_hierarchy_for_credential_2">
 <area shape="rect" href="javascript:void(0);" title="google.appengine.ext.db.Property" alt="" coords="5,5,221,32"/>
-<area shape="rect" href="oauth2client.appengine.CredentialsProperty-class.html" title="CredentialsProperty" alt="" coords="45,61,181,88"/>
+<area shape="rect" href="oauth2client.appengine.CredentialsProperty-class.html" title="CredentialsProperty" alt="" coords="245,5,381,32"/>
 </map>
   <img src="class_hierarchy_for_credential_2.gif" alt='' usemap="#class_hierarchy_for_credential_2" ismap="ismap" class="graph-without-title" />
 </center>
@@ -71,32 +71,6 @@
 
 </pre>
 
-<!-- ==================== NESTED CLASSES ==================== -->
-<a name="section-NestedClasses"></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">Nested Classes</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-NestedClasses"
-         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">
-        <a href="oauth2client.client.Credentials-class.html" class="summary-name">data_type</a><br />
-      Base class for all Credentials objects.
-    </td>
-  </tr>
-</table>
 <!-- ==================== INSTANCE METHODS ==================== -->
 <a name="section-InstanceMethods"></a>
 <table class="summary" border="1" cellpadding="3"
@@ -218,6 +192,14 @@
     </table>
   </td>
 </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="data_type"></a><span class="summary-name">data_type</span> = <code title="Credentials">Credentials</code><br />
+      str(object) -&gt; string
+    </td>
+  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>google.appengine.ext.db.Property</code></b>:
@@ -418,7 +400,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine.FlowProperty-class.html b/docs/epy/oauth2client.appengine.FlowProperty-class.html
index 3be34e4..2eff054 100644
--- a/docs/epy/oauth2client.appengine.FlowProperty-class.html
+++ b/docs/epy/oauth2client.appengine.FlowProperty-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_flowproper" name="class_hierarchy_for_flowproper">
 <area shape="rect" href="javascript:void(0);" title="google.appengine.ext.db.Property" alt="" coords="5,5,221,32"/>
-<area shape="rect" href="oauth2client.appengine.FlowProperty-class.html" title="FlowProperty" alt="" coords="65,61,161,88"/>
+<area shape="rect" href="oauth2client.appengine.FlowProperty-class.html" title="FlowProperty" alt="" coords="245,5,341,32"/>
 </map>
   <img src="class_hierarchy_for_flowproper.gif" alt='' usemap="#class_hierarchy_for_flowproper" ismap="ismap" class="graph-without-title" />
 </center>
@@ -71,32 +71,6 @@
 
 </pre>
 
-<!-- ==================== NESTED CLASSES ==================== -->
-<a name="section-NestedClasses"></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">Nested Classes</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-NestedClasses"
-         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">
-        <a href="oauth2client.client.Flow-class.html" class="summary-name">data_type</a><br />
-      Base class for all Flow objects.
-    </td>
-  </tr>
-</table>
 <!-- ==================== INSTANCE METHODS ==================== -->
 <a name="section-InstanceMethods"></a>
 <table class="summary" border="1" cellpadding="3"
@@ -235,6 +209,14 @@
     </table>
   </td>
 </tr>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="data_type"></a><span class="summary-name">data_type</span> = <code title="Flow">Flow</code><br />
+      str(object) -&gt; string
+    </td>
+  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>google.appengine.ext.db.Property</code></b>:
@@ -473,7 +455,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine.InvalidClientSecretsError-class.html b/docs/epy/oauth2client.appengine.InvalidClientSecretsError-class.html
index 7667144..cfe5e99 100644
--- a/docs/epy/oauth2client.appengine.InvalidClientSecretsError-class.html
+++ b/docs/epy/oauth2client.appengine.InvalidClientSecretsError-class.html
@@ -166,7 +166,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:44 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:13 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine.InvalidXsrfTokenError-class.html b/docs/epy/oauth2client.appengine.InvalidXsrfTokenError-class.html
index 6943496..b1f36fc 100644
--- a/docs/epy/oauth2client.appengine.InvalidXsrfTokenError-class.html
+++ b/docs/epy/oauth2client.appengine.InvalidXsrfTokenError-class.html
@@ -166,7 +166,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine.OAuth2Decorator-class.html b/docs/epy/oauth2client.appengine.OAuth2Decorator-class.html
index 864f936..603e9b0 100644
--- a/docs/epy/oauth2client.appengine.OAuth2Decorator-class.html
+++ b/docs/epy/oauth2client.appengine.OAuth2Decorator-class.html
@@ -56,8 +56,7 @@
 <h1 class="epydoc">Class OAuth2Decorator</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.appengine-pysrc.html#OAuth2Decorator">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_oauth2deco" name="class_hierarchy_for_oauth2deco">
-<area shape="rect" href="oauth2client.appengine.OAuth2Decorator-class.html" title="OAuth2Decorator" alt="" coords="60,5,180,32"/>
-<area shape="rect" href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html" title="OAuth2DecoratorFromClientSecrets" alt="" coords="5,61,235,88"/>
+<area shape="rect" href="oauth2client.appengine.OAuth2Decorator-class.html" title="OAuth2Decorator" alt="" coords="5,5,125,32"/>
 </map>
   <img src="class_hierarchy_for_oauth2deco.gif" alt='' usemap="#class_hierarchy_for_oauth2deco" ismap="ismap" class="graph-without-title" />
 </center>
@@ -110,11 +109,19 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.appengine.OAuth2Decorator-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">*args</span>,
+          <td><span class="summary-sig"><a href="oauth2client.appengine.OAuth2Decorator-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">client_id</span>,
+        <span class="summary-sig-arg">client_secret</span>,
+        <span class="summary-sig-arg">scope</span>,
+        <span class="summary-sig-arg">auth_uri</span>=<span class="summary-sig-default">'https://accounts.google.com/o/oauth2/auth'</span>,
+        <span class="summary-sig-arg">token_uri</span>=<span class="summary-sig-default">'https://accounts.google.com/o/oauth2/token'</span>,
+        <span class="summary-sig-arg">user_agent</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">message</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">callback_path</span>=<span class="summary-sig-default">'/oauth2callback'</span>,
         <span class="summary-sig-arg">**kwargs</span>)</span><br />
       Constructor for OAuth2Decorator</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.appengine-pysrc.html#OAuth2Decorator.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -250,6 +257,23 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
+          <td><span class="summary-sig"><a href="oauth2client.appengine.OAuth2Decorator-class.html#callback_path" class="summary-sig-name">callback_path</a>(<span class="summary-sig-arg">self</span>)</span><br />
+      The absolute path where the callback will occur.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="oauth2client.appengine-pysrc.html#OAuth2Decorator.callback_path">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="oauth2client.appengine.OAuth2Decorator-class.html#callback_handler" class="summary-sig-name">callback_handler</a>(<span class="summary-sig-arg">self</span>)</span><br />
       RequestHandler for the OAuth 2.0 redirect callback.</td>
           <td align="right" valign="top">
@@ -314,14 +338,6 @@
     </table>
   </td>
 </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a href="oauth2client.appengine.OAuth2Decorator-class.html#callback_path" class="summary-name">callback_path</a><br />
-      The absolute path where the callback will occur.
-    </td>
-  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
@@ -355,12 +371,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">*args</span>,
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">client_id</span>,
+        <span class="sig-arg">client_secret</span>,
+        <span class="sig-arg">scope</span>,
+        <span class="sig-arg">auth_uri</span>=<span class="sig-default">'https://accounts.google.com/o/oauth2/auth'</span>,
+        <span class="sig-arg">token_uri</span>=<span class="sig-default">'https://accounts.google.com/o/oauth2/token'</span>,
+        <span class="sig-arg">user_agent</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">message</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">callback_path</span>=<span class="sig-default">'/oauth2callback'</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="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.appengine-pysrc.html#OAuth2Decorator.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -567,6 +591,39 @@
   </dl>
 </td></tr></table>
 </div>
+<a name="callback_path"></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">callback_path</span>(<span class="sig-arg">self</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="oauth2client.appengine-pysrc.html#OAuth2Decorator.callback_path">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+The absolute path where the callback will occur.
+
+Note this is the absolute path, not the absolute URI, that will be
+calculated by the decorator at runtime. See callback_handler() for how this
+should be used.
+
+Returns:
+  The callback path as a string.
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@property</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
 <a name="callback_handler"></a>
 <div>
 <table class="details" border="1" cellpadding="3"
@@ -630,50 +687,6 @@
 </td></tr></table>
 </div>
 <br />
-<!-- ==================== PROPERTY DETAILS ==================== -->
-<a name="section-PropertyDetails"></a>
-<table class="details" 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">Property Details</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-PropertyDetails"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
-<a name="callback_path"></a>
-<div>
-<table class="details" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
-  <h3 class="epydoc">callback_path</h3>
-  <pre class="literalblock">
-The absolute path where the callback will occur.
-
-Note this is the absolute path, not the absolute URI, that will be
-calculated by the decorator at runtime. See callback_handler() for how this
-should be used.
-
-Returns:
-  The callback path as a string.
-
-</pre>
-  <dl class="fields">
-    <dt>Get Method:</dt>
-    <dd class="value"><span class="summary-sig"><i>unreachable</i>.callback_path(<span class="summary-sig-arg">self</span>)</span>
-        - The absolute path where the callback will occur.
-    </dd>
-  </dl>
-</td></tr></table>
-</div>
-<br />
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -697,7 +710,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html b/docs/epy/oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html
index 3eff71d..9b173bf 100644
--- a/docs/epy/oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html
+++ b/docs/epy/oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html
@@ -56,8 +56,8 @@
 <h1 class="epydoc">Class OAuth2DecoratorFromClientSecrets</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.appengine-pysrc.html#OAuth2DecoratorFromClientSecrets">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_oauth2deco_2" name="class_hierarchy_for_oauth2deco_2">
-<area shape="rect" href="oauth2client.appengine.OAuth2Decorator-class.html" title="OAuth2Decorator" alt="" coords="60,5,180,32"/>
-<area shape="rect" href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html" title="OAuth2DecoratorFromClientSecrets" alt="" coords="5,61,235,88"/>
+<area shape="rect" href="oauth2client.appengine.OAuth2Decorator-class.html" title="OAuth2Decorator" alt="" coords="5,5,125,32"/>
+<area shape="rect" href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html" title="OAuth2DecoratorFromClientSecrets" alt="" coords="149,5,379,32"/>
 </map>
   <img src="class_hierarchy_for_oauth2deco_2.gif" alt='' usemap="#class_hierarchy_for_oauth2deco_2" ismap="ismap" class="graph-without-title" />
 </center>
@@ -109,11 +109,14 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-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 />
+          <td><span class="summary-sig"><a href="oauth2client.appengine.OAuth2DecoratorFromClientSecrets-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">filename</span>,
+        <span class="summary-sig-arg">scope</span>,
+        <span class="summary-sig-arg">message</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">cache</span>=<span class="summary-sig-default">None</span>)</span><br />
       Constructor</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.appengine-pysrc.html#OAuth2DecoratorFromClientSecrets.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -127,6 +130,7 @@
       <code><a href="oauth2client.appengine.OAuth2Decorator-class.html#authorize_url">authorize_url</a></code>,
       <code><a href="oauth2client.appengine.OAuth2Decorator-class.html#callback_application">callback_application</a></code>,
       <code><a href="oauth2client.appengine.OAuth2Decorator-class.html#callback_handler">callback_handler</a></code>,
+      <code><a href="oauth2client.appengine.OAuth2Decorator-class.html#callback_path">callback_path</a></code>,
       <code><a href="oauth2client.appengine.OAuth2Decorator-class.html#has_credentials">has_credentials</a></code>,
       <code><a href="oauth2client.appengine.OAuth2Decorator-class.html#http">http</a></code>,
       <code><a href="oauth2client.appengine.OAuth2Decorator-class.html#oauth_aware">oauth_aware</a></code>,
@@ -172,9 +176,6 @@
 </tr>
   <tr>
     <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.appengine.OAuth2Decorator-class.html">OAuth2Decorator</a></code></b>:
-      <code><a href="oauth2client.appengine.OAuth2Decorator-class.html#callback_path">callback_path</a></code>
-      </p>
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
       <code>__class__</code>
       </p>
@@ -206,12 +207,15 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">filename</span>,
+        <span class="sig-arg">scope</span>,
+        <span class="sig-arg">message</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">cache</span>=<span class="sig-default">None</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.appengine-pysrc.html#OAuth2DecoratorFromClientSecrets.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -265,7 +269,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine.SiteXsrfSecretKey-class.html b/docs/epy/oauth2client.appengine.SiteXsrfSecretKey-class.html
index 5748a7d..9a63987 100644
--- a/docs/epy/oauth2client.appengine.SiteXsrfSecretKey-class.html
+++ b/docs/epy/oauth2client.appengine.SiteXsrfSecretKey-class.html
@@ -57,7 +57,7 @@
 <center>
 <center>  <map id="class_hierarchy_for_sitexsrfse" name="class_hierarchy_for_sitexsrfse">
 <area shape="rect" href="javascript:void(0);" title="google.appengine.ext.db.Model" alt="" coords="5,5,205,32"/>
-<area shape="rect" href="oauth2client.appengine.SiteXsrfSecretKey-class.html" title="SiteXsrfSecretKey" alt="" coords="43,61,168,88"/>
+<area shape="rect" href="oauth2client.appengine.SiteXsrfSecretKey-class.html" title="SiteXsrfSecretKey" alt="" coords="229,5,355,32"/>
 </map>
   <img src="class_hierarchy_for_sitexsrfse.gif" alt='' usemap="#class_hierarchy_for_sitexsrfse" ismap="ismap" class="graph-without-title" />
 </center>
@@ -117,6 +117,7 @@
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>google.appengine.ext.db.Model</code></b>:
       <code>__init__</code>,
+      <code>__new__</code>,
       <code>delete</code>,
       <code>dynamic_properties</code>,
       <code>has_key</code>,
@@ -188,31 +189,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 colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code>google.appengine.ext.db.Model</code></b>:
-      <code>__new__</code>
-      </p>
-    </td>
-  </tr>
-</table>
 <!-- ==================== CLASS VARIABLES ==================== -->
 <a name="section-ClassVariables"></a>
 <table class="summary" border="1" cellpadding="3"
@@ -237,28 +213,6 @@
         <a name="secret"></a><span class="summary-name">secret</span> = <code title="db.StringProperty()">db.StringProperty()</code>
     </td>
   </tr>
-<tr class="private">
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="_all_properties"></a><span class="summary-name">_all_properties</span> = <code title="frozenset(['secret'])"><code class="variable-group">frozenset([</code><code class="variable-quote">'</code><code class="variable-string">secret</code><code class="variable-quote">'</code><code class="variable-group">])</code></code>
-    </td>
-  </tr>
-<tr class="private">
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a href="oauth2client.appengine.SiteXsrfSecretKey-class.html#_properties" class="summary-name" onclick="show_private();">_properties</a> = <code title="{'secret': &lt;google.appengine.ext.db.StringProperty object at 0x1e8da10\
-&gt;}"><code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">secret</code><code class="variable-quote">'</code><code class="variable-op">: </code>&lt;google.appengine.ext.db.StringProper<code class="variable-ellipsis">...</code></code>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" class="summary">
-    <div class="private">    <p class="indent-wrapped-lines"><b>Inherited from <code>google.appengine.ext.db.Model</code></b> (private):
-      <code>_unindexed_properties</code>
-      </p></div>
-    </td>
-  </tr>
 </table>
 <!-- ==================== PROPERTIES ==================== -->
 <a name="section-Properties"></a>
@@ -285,44 +239,6 @@
     </td>
   </tr>
 </table>
-<!-- ==================== CLASS VARIABLE DETAILS ==================== -->
-<a name="section-ClassVariableDetails"></a>
-<table class="details" 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">Class Variable Details</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-ClassVariableDetails"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
-<a name="_properties"></a>
-<div class="private">
-<table class="details" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
-  <h3 class="epydoc">_properties</h3>
-  
-  <dl class="fields">
-  </dl>
-  <dl class="fields">
-    <dt>Value:</dt>
-      <dd><table><tr><td><pre class="variable">
-<code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">secret</code><code class="variable-quote">'</code><code class="variable-op">: </code>&lt;google.appengine.ext.db.StringProperty object at 0x1e8da10<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
-&gt;<code class="variable-group">}</code>
-</pre></td></tr></table>
-</dd>
-  </dl>
-</td></tr></table>
-</div>
-<br />
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -346,7 +262,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.appengine.StorageByKeyName-class.html b/docs/epy/oauth2client.appengine.StorageByKeyName-class.html
index 7f928f7..d120f2b 100644
--- a/docs/epy/oauth2client.appengine.StorageByKeyName-class.html
+++ b/docs/epy/oauth2client.appengine.StorageByKeyName-class.html
@@ -56,8 +56,8 @@
 <h1 class="epydoc">Class StorageByKeyName</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.appengine-pysrc.html#StorageByKeyName">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_storagebyk" name="class_hierarchy_for_storagebyk">
-<area shape="rect" href="oauth2client.appengine.StorageByKeyName-class.html" title="StorageByKeyName" alt="" coords="5,61,144,88"/>
-<area shape="rect" href="oauth2client.client.Storage-class.html" title="client.Storage" alt="" coords="24,5,125,32"/>
+<area shape="rect" href="oauth2client.appengine.StorageByKeyName-class.html" title="StorageByKeyName" alt="" coords="5,5,144,32"/>
+<area shape="rect" href="oauth2client.client.Storage-class.html" title="client.Storage" alt="" coords="168,5,269,32"/>
 </map>
   <img src="class_hierarchy_for_storagebyk.gif" alt='' usemap="#class_hierarchy_for_storagebyk" ismap="ismap" class="graph-without-title" />
 </center>
@@ -97,11 +97,14 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.appengine.StorageByKeyName-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 />
+          <td><span class="summary-sig"><a href="oauth2client.appengine.StorageByKeyName-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">model</span>,
+        <span class="summary-sig-arg">key_name</span>,
+        <span class="summary-sig-arg">property_name</span>,
+        <span class="summary-sig-arg">cache</span>=<span class="summary-sig-default">None</span>)</span><br />
       Constructor for Storage.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.appengine-pysrc.html#StorageByKeyName.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -237,12 +240,15 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">model</span>,
+        <span class="sig-arg">key_name</span>,
+        <span class="sig-arg">property_name</span>,
+        <span class="sig-arg">cache</span>=<span class="sig-default">None</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.appengine-pysrc.html#StorageByKeyName.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -373,7 +379,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client-module.html b/docs/epy/oauth2client.client-module.html
index 94e6275..e0510fd 100644
--- a/docs/epy/oauth2client.client-module.html
+++ b/docs/epy/oauth2client.client-module.html
@@ -235,6 +235,26 @@
       
     </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="oauth2client.client-module.html#verify_id_token" class="summary-sig-name">verify_id_token</a>(<span class="summary-sig-arg">id_token</span>,
+        <span class="summary-sig-arg">audience</span>,
+        <span class="summary-sig-arg">http</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">cert_uri</span>=<span class="summary-sig-default">ID_TOKEN_VERIFICATON_CERTS</span>)</span><br />
+      Verifies a signed JWT id_token.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#verify_id_token">source&nbsp;code</a></span>
+            
+          </td>
+        </tr>
+      </table>
+      
+    </td>
+  </tr>
 <tr class="private">
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
@@ -285,6 +305,74 @@
       
     </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="oauth2client.client-module.html#credentials_from_code" class="summary-sig-name">credentials_from_code</a>(<span class="summary-sig-arg">client_id</span>,
+        <span class="summary-sig-arg">client_secret</span>,
+        <span class="summary-sig-arg">scope</span>,
+        <span class="summary-sig-arg">code</span>,
+        <span class="summary-sig-arg">redirect_uri</span>=<span class="summary-sig-default">'postmessage'</span>,
+        <span class="summary-sig-arg">http</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">user_agent</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">token_uri</span>=<span class="summary-sig-default">'https://accounts.google.com/o/oauth2/token'</span>)</span><br />
+      Exchanges an authorization code for an OAuth2Credentials object.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#credentials_from_code">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="oauth2client.client-module.html#credentials_from_clientsecrets_and_code" class="summary-sig-name">credentials_from_clientsecrets_and_code</a>(<span class="summary-sig-arg">filename</span>,
+        <span class="summary-sig-arg">scope</span>,
+        <span class="summary-sig-arg">code</span>,
+        <span class="summary-sig-arg">message</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">redirect_uri</span>=<span class="summary-sig-default">'postmessage'</span>,
+        <span class="summary-sig-arg">http</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">cache</span>=<span class="summary-sig-default">None</span>)</span><br />
+      Returns OAuth2Credentials from a clientsecrets file and an auth code.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#credentials_from_clientsecrets_and_code">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="oauth2client.client-module.html#flow_from_clientsecrets" class="summary-sig-name">flow_from_clientsecrets</a>(<span class="summary-sig-arg">filename</span>,
+        <span class="summary-sig-arg">scope</span>,
+        <span class="summary-sig-arg">redirect_uri</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">message</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">cache</span>=<span class="summary-sig-default">None</span>)</span><br />
+      Create a Flow from a clientsecrets file.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#flow_from_clientsecrets">source&nbsp;code</a></span>
+            
+          </td>
+        </tr>
+      </table>
+      
+    </td>
+  </tr>
 </table>
 <!-- ==================== VARIABLES ==================== -->
 <a name="section-Variables"></a>
@@ -321,21 +409,21 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="EXPIRY_FORMAT"></a><span class="summary-name">EXPIRY_FORMAT</span> = <code title="'%Y-%m-%dT%H:%M:%SZ'"><code class="variable-quote">'</code><code class="variable-string">%Y-%m-%dT%H:%M:%SZ</code><code class="variable-quote">'</code></code>
+        <a name="EXPIRY_FORMAT"></a><span class="summary-name">EXPIRY_FORMAT</span> = <code title="'%Y-%m-%dT%H:%M:%SZ'">'%Y-%m-%dT%H:%M:%SZ'</code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a href="oauth2client.client-module.html#ID_TOKEN_VERIFICATON_CERTS" class="summary-name">ID_TOKEN_VERIFICATON_CERTS</a> = <code title="'https://www.googleapis.com/oauth2/v1/certs'"><code class="variable-quote">'</code><code class="variable-string">https://www.googleapis.com/oauth</code><code class="variable-ellipsis">...</code></code>
+        <a href="oauth2client.client-module.html#ID_TOKEN_VERIFICATON_CERTS" class="summary-name">ID_TOKEN_VERIFICATON_CERTS</a> = <code title="'https://www.googleapis.com/oauth2/v1/certs'">'https://www.googleapis.com/oauth<code class="variable-ellipsis">...</code></code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="OOB_CALLBACK_URN"></a><span class="summary-name">OOB_CALLBACK_URN</span> = <code title="'urn:ietf:wg:oauth:2.0:oob'"><code class="variable-quote">'</code><code class="variable-string">urn:ietf:wg:oauth:2.0:oob</code><code class="variable-quote">'</code></code>
+        <a name="OOB_CALLBACK_URN"></a><span class="summary-name">OOB_CALLBACK_URN</span> = <code title="'urn:ietf:wg:oauth:2.0:oob'">'urn:ietf:wg:oauth:2.0:oob'</code>
     </td>
   </tr>
 <tr class="private">
@@ -345,13 +433,6 @@
         <a name="_cached_http"></a><span class="summary-name">_cached_http</span> = <code title="httplib2.Http(MemoryCache())">httplib2.Http(MemoryCache())</code>
     </td>
   </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
 </table>
 <!-- ==================== FUNCTION DETAILS ==================== -->
 <a name="section-FunctionDetails"></a>
@@ -371,6 +452,52 @@
   </td>
 </tr>
 </table>
+<a name="verify_id_token"></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">verify_id_token</span>(<span class="sig-arg">id_token</span>,
+        <span class="sig-arg">audience</span>,
+        <span class="sig-arg">http</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">cert_uri</span>=<span class="sig-default">ID_TOKEN_VERIFICATON_CERTS</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#verify_id_token">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+Verifies a signed JWT id_token.
+
+This function requires PyOpenSSL and because of that it does not work on
+App Engine. For App Engine you may consider using AppAssertionCredentials.
+
+Args:
+  id_token: string, A Signed JWT.
+  audience: string, The audience 'aud' that the token should be for.
+  http: httplib2.Http, instance to use to make the HTTP request. Callers
+    should supply an instance that has caching enabled.
+  cert_uri: string, URI of the certificates in JSON format to
+    verify the JWT against.
+
+Returns:
+  The deserialized JSON in the JWT.
+
+Raises:
+  oauth2client.crypt.AppIdentityError if the JWT fails to verify.
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@util.positional(2)</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
 <a name="_extract_id_token"></a>
 <div class="private">
 <table class="details" border="1" cellpadding="3"
@@ -433,6 +560,171 @@
   </dl>
 </td></tr></table>
 </div>
+<a name="credentials_from_code"></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">credentials_from_code</span>(<span class="sig-arg">client_id</span>,
+        <span class="sig-arg">client_secret</span>,
+        <span class="sig-arg">scope</span>,
+        <span class="sig-arg">code</span>,
+        <span class="sig-arg">redirect_uri</span>=<span class="sig-default">'postmessage'</span>,
+        <span class="sig-arg">http</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">user_agent</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">token_uri</span>=<span class="sig-default">'https://accounts.google.com/o/oauth2/token'</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#credentials_from_code">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+Exchanges an authorization code for an OAuth2Credentials object.
+
+Args:
+  client_id: string, client identifier.
+  client_secret: string, client secret.
+  scope: string or list of strings, scope(s) to request.
+  code: string, An authroization code, most likely passed down from
+    the client
+  redirect_uri: string, this is generally set to 'postmessage' to match the
+    redirect_uri that the client specified
+  http: httplib2.Http, optional http instance to use to do the fetch
+  token_uri: string, URI for token endpoint. For convenience
+    defaults to Google's endpoints but any OAuth 2.0 provider can be used.
+Returns:
+  An OAuth2Credentials object.
+
+Raises:
+  FlowExchangeError if the authorization code cannot be exchanged for an
+   access token
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@util.positional(4)</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
+<a name="credentials_from_clientsecrets_and_code"></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">credentials_from_clientsecrets_and_code</span>(<span class="sig-arg">filename</span>,
+        <span class="sig-arg">scope</span>,
+        <span class="sig-arg">code</span>,
+        <span class="sig-arg">message</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">redirect_uri</span>=<span class="sig-default">'postmessage'</span>,
+        <span class="sig-arg">http</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">cache</span>=<span class="sig-default">None</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#credentials_from_clientsecrets_and_code">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+Returns OAuth2Credentials from a clientsecrets file and an auth code.
+
+Will create the right kind of Flow based on the contents of the clientsecrets
+file or will raise InvalidClientSecretsError for unknown types of Flows.
+
+Args:
+  filename: string, File name of clientsecrets.
+  scope: string or list of strings, scope(s) to request.
+  code: string, An authorization code, most likely passed down from
+    the client
+  message: string, A friendly string to display to the user if the
+    clientsecrets file is missing or invalid. If message is provided then
+    sys.exit will be called in the case of an error. If message in not
+    provided then clientsecrets.InvalidClientSecretsError will be raised.
+  redirect_uri: string, this is generally set to 'postmessage' to match the
+    redirect_uri that the client specified
+  http: httplib2.Http, optional http instance to use to do the fetch
+  cache: An optional cache service client that implements get() and set()
+    methods. See clientsecrets.loadfile() for details.
+
+Returns:
+  An OAuth2Credentials object.
+
+Raises:
+  FlowExchangeError if the authorization code cannot be exchanged for an
+   access token
+  UnknownClientSecretsFlowError if the file describes an unknown kind of Flow.
+  clientsecrets.InvalidClientSecretsError if the clientsecrets file is
+    invalid.
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@util.positional(3)</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
+<a name="flow_from_clientsecrets"></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">flow_from_clientsecrets</span>(<span class="sig-arg">filename</span>,
+        <span class="sig-arg">scope</span>,
+        <span class="sig-arg">redirect_uri</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">message</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">cache</span>=<span class="sig-default">None</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#flow_from_clientsecrets">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+Create a Flow from a clientsecrets file.
+
+Will create the right kind of Flow based on the contents of the clientsecrets
+file or will raise InvalidClientSecretsError for unknown types of Flows.
+
+Args:
+  filename: string, File name of client secrets.
+  scope: string or list of strings, scope(s) to request.
+  redirect_uri: string, Either the string 'urn:ietf:wg:oauth:2.0:oob' for
+      a non-web-based application, or a URI that handles the callback from
+      the authorization server.
+  message: string, A friendly string to display to the user if the
+    clientsecrets file is missing or invalid. If message is provided then
+    sys.exit will be called in the case of an error. If message in not
+    provided then clientsecrets.InvalidClientSecretsError will be raised.
+  cache: An optional cache service client that implements get() and set()
+    methods. See clientsecrets.loadfile() for details.
+
+Returns:
+  A Flow object.
+
+Raises:
+  UnknownClientSecretsFlowError if the file describes an unknown kind of Flow.
+  clientsecrets.InvalidClientSecretsError if the clientsecrets file is
+    invalid.
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@util.positional(2)</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
 <br />
 <!-- ==================== VARIABLES DETAILS ==================== -->
 <a name="section-VariablesDetails"></a>
@@ -464,7 +756,7 @@
   <dl class="fields">
     <dt>Value:</dt>
       <dd><table><tr><td><pre class="variable">
-<code class="variable-quote">'</code><code class="variable-string">https://www.googleapis.com/oauth2/v1/certs</code><code class="variable-quote">'</code>
+'https://www.googleapis.com/oauth2/v1/certs'
 </pre></td></tr></table>
 </dd>
   </dl>
@@ -494,7 +786,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client-pysrc.html b/docs/epy/oauth2client.client-pysrc.html
index 0236ba1..bc6ad1c 100644
--- a/docs/epy/oauth2client.client-pysrc.html
+++ b/docs/epy/oauth2client.client-pysrc.html
@@ -1358,13 +1358,13 @@
 <a name="L996"></a><tt class="py-lineno"> 996</tt>  <tt class="py-line"><tt class="py-docstring">    clientsecrets.InvalidClientSecretsError if the clientsecrets file is</tt> </tt>
 <a name="L997"></a><tt class="py-lineno"> 997</tt>  <tt class="py-line"><tt class="py-docstring">      invalid.</tt> </tt>
 <a name="L998"></a><tt class="py-lineno"> 998</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
-<a name="L999"></a><tt class="py-lineno"> 999</tt>  <tt class="py-line">  <tt class="py-name">flow</tt> <tt class="py-op">=</tt> <tt class="py-name">flow_from_clientsecrets</tt><tt class="py-op">(</tt><tt id="link-137" class="py-name" targets="Method oauth2client.locked_file.LockedFile.filename()=oauth2client.locked_file.LockedFile-class.html#filename,Method oauth2client.locked_file._Opener.filename()=oauth2client.locked_file._Opener-class.html#filename"><a title="oauth2client.locked_file.LockedFile.filename
-oauth2client.locked_file._Opener.filename" class="py-name" href="#" onclick="return doclink('link-137', 'filename', 'link-137');">filename</a></tt><tt class="py-op">,</tt> <tt class="py-name">scope</tt><tt class="py-op">,</tt> <tt class="py-name">message</tt><tt class="py-op">=</tt><tt class="py-name">message</tt><tt class="py-op">,</tt> <tt class="py-name">cache</tt><tt class="py-op">=</tt><tt class="py-name">cache</tt><tt class="py-op">,</tt> </tt>
+<a name="L999"></a><tt class="py-lineno"> 999</tt>  <tt class="py-line">  <tt class="py-name">flow</tt> <tt class="py-op">=</tt> <tt id="link-137" class="py-name" targets="Function oauth2client.client.flow_from_clientsecrets()=oauth2client.client-module.html#flow_from_clientsecrets"><a title="oauth2client.client.flow_from_clientsecrets" class="py-name" href="#" onclick="return doclink('link-137', 'flow_from_clientsecrets', 'link-137');">flow_from_clientsecrets</a></tt><tt class="py-op">(</tt><tt id="link-138" class="py-name" targets="Method oauth2client.locked_file.LockedFile.filename()=oauth2client.locked_file.LockedFile-class.html#filename,Method oauth2client.locked_file._Opener.filename()=oauth2client.locked_file._Opener-class.html#filename"><a title="oauth2client.locked_file.LockedFile.filename
+oauth2client.locked_file._Opener.filename" class="py-name" href="#" onclick="return doclink('link-138', 'filename', 'link-138');">filename</a></tt><tt class="py-op">,</tt> <tt class="py-name">scope</tt><tt class="py-op">,</tt> <tt class="py-name">message</tt><tt class="py-op">=</tt><tt class="py-name">message</tt><tt class="py-op">,</tt> <tt class="py-name">cache</tt><tt class="py-op">=</tt><tt class="py-name">cache</tt><tt class="py-op">,</tt> </tt>
 <a name="L1000"></a><tt class="py-lineno">1000</tt>  <tt class="py-line">                                 <tt class="py-name">redirect_uri</tt><tt class="py-op">=</tt><tt class="py-name">redirect_uri</tt><tt class="py-op">)</tt> </tt>
-<a name="L1001"></a><tt class="py-lineno">1001</tt>  <tt class="py-line">  <tt id="link-138" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-138', 'credentials', 'link-41');">credentials</a></tt> <tt class="py-op">=</tt> <tt class="py-name">flow</tt><tt class="py-op">.</tt><tt id="link-139" class="py-name"><a title="oauth2client.client.OAuth2WebServerFlow.step2_exchange" class="py-name" href="#" onclick="return doclink('link-139', 'step2_exchange', 'link-132');">step2_exchange</a></tt><tt class="py-op">(</tt><tt class="py-name">code</tt><tt class="py-op">,</tt> <tt id="link-140" class="py-name"><a title="apiclient.http
-oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-140', 'http', 'link-47');">http</a></tt><tt class="py-op">=</tt><tt id="link-141" class="py-name"><a title="apiclient.http
-oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-141', 'http', 'link-47');">http</a></tt><tt class="py-op">)</tt> </tt>
-<a name="L1002"></a><tt class="py-lineno">1002</tt>  <tt class="py-line">  <tt class="py-keyword">return</tt> <tt id="link-142" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-142', 'credentials', 'link-41');">credentials</a></tt> </tt>
+<a name="L1001"></a><tt class="py-lineno">1001</tt>  <tt class="py-line">  <tt id="link-139" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-139', 'credentials', 'link-41');">credentials</a></tt> <tt class="py-op">=</tt> <tt class="py-name">flow</tt><tt class="py-op">.</tt><tt id="link-140" class="py-name"><a title="oauth2client.client.OAuth2WebServerFlow.step2_exchange" class="py-name" href="#" onclick="return doclink('link-140', 'step2_exchange', 'link-132');">step2_exchange</a></tt><tt class="py-op">(</tt><tt class="py-name">code</tt><tt class="py-op">,</tt> <tt id="link-141" class="py-name"><a title="apiclient.http
+oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-141', 'http', 'link-47');">http</a></tt><tt class="py-op">=</tt><tt id="link-142" class="py-name"><a title="apiclient.http
+oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-142', 'http', 'link-47');">http</a></tt><tt class="py-op">)</tt> </tt>
+<a name="L1002"></a><tt class="py-lineno">1002</tt>  <tt class="py-line">  <tt class="py-keyword">return</tt> <tt id="link-143" class="py-name"><a title="oauth2client.appengine.CredentialsModel.credentials" class="py-name" href="#" onclick="return doclink('link-143', 'credentials', 'link-41');">credentials</a></tt> </tt>
 </div><a name="L1003"></a><tt class="py-lineno">1003</tt>  <tt class="py-line"> </tt>
 <a name="OAuth2WebServerFlow"></a><div id="OAuth2WebServerFlow-def"><a name="L1004"></a><tt class="py-lineno">1004</tt>  <tt class="py-line"> </tt>
 <a name="L1005"></a><tt class="py-lineno">1005</tt> <a class="py-toggle" href="#" id="OAuth2WebServerFlow-toggle" onclick="return toggle('OAuth2WebServerFlow');">-</a><tt class="py-line"><tt class="py-keyword">class</tt> <a class="py-def-name" href="oauth2client.client.OAuth2WebServerFlow-class.html">OAuth2WebServerFlow</a><tt class="py-op">(</tt><tt class="py-base-class">Flow</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
@@ -1373,7 +1373,7 @@
 <a name="L1008"></a><tt class="py-lineno">1008</tt>  <tt class="py-line"><tt class="py-docstring">  OAuth2WebServerFlow objects may be safely pickled and unpickled.</tt> </tt>
 <a name="L1009"></a><tt class="py-lineno">1009</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
 <a name="L1010"></a><tt class="py-lineno">1010</tt>  <tt class="py-line"> </tt>
-<a name="L1011"></a><tt class="py-lineno">1011</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-143" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-143', 'positional', 'link-46');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">4</tt><tt class="py-op">)</tt> </tt>
+<a name="L1011"></a><tt class="py-lineno">1011</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-144" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-144', 'positional', 'link-46');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">4</tt><tt class="py-op">)</tt> </tt>
 <a name="OAuth2WebServerFlow.__init__"></a><div id="OAuth2WebServerFlow.__init__-def"><a name="L1012"></a><tt class="py-lineno">1012</tt> <a class="py-toggle" href="#" id="OAuth2WebServerFlow.__init__-toggle" onclick="return toggle('OAuth2WebServerFlow.__init__');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.client.OAuth2WebServerFlow-class.html#__init__">__init__</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">client_id</tt><tt class="py-op">,</tt> <tt class="py-param">client_secret</tt><tt class="py-op">,</tt> <tt class="py-param">scope</tt><tt class="py-op">,</tt> </tt>
 <a name="L1013"></a><tt class="py-lineno">1013</tt>  <tt class="py-line">               <tt class="py-param">redirect_uri</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">,</tt> </tt>
 <a name="L1014"></a><tt class="py-lineno">1014</tt>  <tt class="py-line">               <tt class="py-param">user_agent</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">,</tt> </tt>
@@ -1412,7 +1412,7 @@
 <a name="L1047"></a><tt class="py-lineno">1047</tt>  <tt class="py-line">        <tt class="py-op">}</tt> </tt>
 <a name="L1048"></a><tt class="py-lineno">1048</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">params</tt><tt class="py-op">.</tt><tt class="py-name">update</tt><tt class="py-op">(</tt><tt class="py-name">kwargs</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L1049"></a><tt class="py-lineno">1049</tt>  <tt class="py-line"> </tt>
-<a name="L1050"></a><tt class="py-lineno">1050</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-144" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-144', 'positional', 'link-46');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">1</tt><tt class="py-op">)</tt> </tt>
+<a name="L1050"></a><tt class="py-lineno">1050</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-145" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-145', 'positional', 'link-46');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">1</tt><tt class="py-op">)</tt> </tt>
 <a name="OAuth2WebServerFlow.step1_get_authorize_url"></a><div id="OAuth2WebServerFlow.step1_get_authorize_url-def"><a name="L1051"></a><tt class="py-lineno">1051</tt> <a class="py-toggle" href="#" id="OAuth2WebServerFlow.step1_get_authorize_url-toggle" onclick="return toggle('OAuth2WebServerFlow.step1_get_authorize_url');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.client.OAuth2WebServerFlow-class.html#step1_get_authorize_url">step1_get_authorize_url</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">redirect_uri</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="OAuth2WebServerFlow.step1_get_authorize_url-collapsed" style="display:none;" pad="++++" indent="++++++"></div><div id="OAuth2WebServerFlow.step1_get_authorize_url-expanded"><a name="L1052"></a><tt class="py-lineno">1052</tt>  <tt class="py-line">    <tt class="py-docstring">"""Returns a URI to redirect to the provider.</tt> </tt>
 <a name="L1053"></a><tt class="py-lineno">1053</tt>  <tt class="py-line"><tt class="py-docstring"></tt> </tt>
@@ -1426,14 +1426,14 @@
 <a name="L1061"></a><tt class="py-lineno">1061</tt>  <tt class="py-line"><tt class="py-docstring">      A URI as a string to redirect the user to begin the authorization flow.</tt> </tt>
 <a name="L1062"></a><tt class="py-lineno">1062</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
 <a name="L1063"></a><tt class="py-lineno">1063</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">redirect_uri</tt> <tt class="py-keyword">is</tt> <tt class="py-keyword">not</tt> <tt class="py-name">None</tt><tt class="py-op">:</tt> </tt>
-<a name="L1064"></a><tt class="py-lineno">1064</tt>  <tt class="py-line">      <tt id="link-145" class="py-name"><a title="apiclient.discovery.logger
+<a name="L1064"></a><tt class="py-lineno">1064</tt>  <tt class="py-line">      <tt id="link-146" class="py-name"><a title="apiclient.discovery.logger
 oauth2client.appengine.logger
 oauth2client.client.logger
 oauth2client.crypt.logger
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-145', 'logger', 'link-16');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">warning</tt><tt class="py-op">(</tt><tt class="py-op">(</tt><tt class="py-string">'The redirect_uri parameter for'</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-146', 'logger', 'link-16');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">warning</tt><tt class="py-op">(</tt><tt class="py-op">(</tt><tt class="py-string">'The redirect_uri parameter for'</tt> </tt>
 <a name="L1065"></a><tt class="py-lineno">1065</tt>  <tt class="py-line">          <tt class="py-string">'OAuth2WebServerFlow.step1_get_authorize_url is deprecated. Please'</tt> </tt>
 <a name="L1066"></a><tt class="py-lineno">1066</tt>  <tt class="py-line">          <tt class="py-string">'move to passing the redirect_uri in via the constructor.'</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L1067"></a><tt class="py-lineno">1067</tt>  <tt class="py-line">      <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">redirect_uri</tt> <tt class="py-op">=</tt> <tt class="py-name">redirect_uri</tt> </tt>
@@ -1453,7 +1453,7 @@
 <a name="L1081"></a><tt class="py-lineno">1081</tt>  <tt class="py-line">    <tt class="py-name">parts</tt><tt class="py-op">[</tt><tt class="py-number">4</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt class="py-name">urllib</tt><tt class="py-op">.</tt><tt class="py-name">urlencode</tt><tt class="py-op">(</tt><tt class="py-name">query</tt><tt class="py-op">)</tt> </tt>
 <a name="L1082"></a><tt class="py-lineno">1082</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">urlparse</tt><tt class="py-op">.</tt><tt class="py-name">urlunparse</tt><tt class="py-op">(</tt><tt class="py-name">parts</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L1083"></a><tt class="py-lineno">1083</tt>  <tt class="py-line"> </tt>
-<a name="L1084"></a><tt class="py-lineno">1084</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-146" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-146', 'positional', 'link-46');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">2</tt><tt class="py-op">)</tt> </tt>
+<a name="L1084"></a><tt class="py-lineno">1084</tt>  <tt class="py-line">  <tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-147" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-147', 'positional', 'link-46');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">2</tt><tt class="py-op">)</tt> </tt>
 <a name="OAuth2WebServerFlow.step2_exchange"></a><div id="OAuth2WebServerFlow.step2_exchange-def"><a name="L1085"></a><tt class="py-lineno">1085</tt> <a class="py-toggle" href="#" id="OAuth2WebServerFlow.step2_exchange-toggle" onclick="return toggle('OAuth2WebServerFlow.step2_exchange');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.client.OAuth2WebServerFlow-class.html#step2_exchange">step2_exchange</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-param">code</tt><tt class="py-op">,</tt> <tt class="py-param">http</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="OAuth2WebServerFlow.step2_exchange-collapsed" style="display:none;" pad="++++" indent="++++++"></div><div id="OAuth2WebServerFlow.step2_exchange-expanded"><a name="L1086"></a><tt class="py-lineno">1086</tt>  <tt class="py-line">    <tt class="py-docstring">"""Exhanges a code for OAuth2Credentials.</tt> </tt>
 <a name="L1087"></a><tt class="py-lineno">1087</tt>  <tt class="py-line"><tt class="py-docstring"></tt> </tt>
@@ -1477,7 +1477,7 @@
 <a name="L1105"></a><tt class="py-lineno">1105</tt>  <tt class="py-line">          <tt class="py-name">error_msg</tt> <tt class="py-op">=</tt> <tt class="py-name">code</tt><tt class="py-op">[</tt><tt class="py-string">'error'</tt><tt class="py-op">]</tt> </tt>
 <a name="L1106"></a><tt class="py-lineno">1106</tt>  <tt class="py-line">        <tt class="py-keyword">else</tt><tt class="py-op">:</tt> </tt>
 <a name="L1107"></a><tt class="py-lineno">1107</tt>  <tt class="py-line">          <tt class="py-name">error_msg</tt> <tt class="py-op">=</tt> <tt class="py-string">'No code was supplied in the query parameters.'</tt> </tt>
-<a name="L1108"></a><tt class="py-lineno">1108</tt>  <tt class="py-line">        <tt class="py-keyword">raise</tt> <tt id="link-147" class="py-name" targets="Class oauth2client.client.FlowExchangeError=oauth2client.client.FlowExchangeError-class.html"><a title="oauth2client.client.FlowExchangeError" class="py-name" href="#" onclick="return doclink('link-147', 'FlowExchangeError', 'link-147');">FlowExchangeError</a></tt><tt class="py-op">(</tt><tt class="py-name">error_msg</tt><tt class="py-op">)</tt> </tt>
+<a name="L1108"></a><tt class="py-lineno">1108</tt>  <tt class="py-line">        <tt class="py-keyword">raise</tt> <tt id="link-148" class="py-name" targets="Class oauth2client.client.FlowExchangeError=oauth2client.client.FlowExchangeError-class.html"><a title="oauth2client.client.FlowExchangeError" class="py-name" href="#" onclick="return doclink('link-148', 'FlowExchangeError', 'link-148');">FlowExchangeError</a></tt><tt class="py-op">(</tt><tt class="py-name">error_msg</tt><tt class="py-op">)</tt> </tt>
 <a name="L1109"></a><tt class="py-lineno">1109</tt>  <tt class="py-line">      <tt class="py-keyword">else</tt><tt class="py-op">:</tt> </tt>
 <a name="L1110"></a><tt class="py-lineno">1110</tt>  <tt class="py-line">        <tt class="py-name">code</tt> <tt class="py-op">=</tt> <tt class="py-name">code</tt><tt class="py-op">[</tt><tt class="py-string">'code'</tt><tt class="py-op">]</tt> </tt>
 <a name="L1111"></a><tt class="py-lineno">1111</tt>  <tt class="py-line"> </tt>
@@ -1496,63 +1496,63 @@
 <a name="L1124"></a><tt class="py-lineno">1124</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">user_agent</tt> <tt class="py-keyword">is</tt> <tt class="py-keyword">not</tt> <tt class="py-name">None</tt><tt class="py-op">:</tt> </tt>
 <a name="L1125"></a><tt class="py-lineno">1125</tt>  <tt class="py-line">      <tt class="py-name">headers</tt><tt class="py-op">[</tt><tt class="py-string">'user-agent'</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">user_agent</tt> </tt>
 <a name="L1126"></a><tt class="py-lineno">1126</tt>  <tt class="py-line"> </tt>
-<a name="L1127"></a><tt class="py-lineno">1127</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt id="link-148" class="py-name"><a title="apiclient.http
-oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-148', 'http', 'link-47');">http</a></tt> <tt class="py-keyword">is</tt> <tt class="py-name">None</tt><tt class="py-op">:</tt> </tt>
-<a name="L1128"></a><tt class="py-lineno">1128</tt>  <tt class="py-line">      <tt id="link-149" class="py-name"><a title="apiclient.http
-oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-149', 'http', 'link-47');">http</a></tt> <tt class="py-op">=</tt> <tt class="py-name">httplib2</tt><tt class="py-op">.</tt><tt class="py-name">Http</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
+<a name="L1127"></a><tt class="py-lineno">1127</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt id="link-149" class="py-name"><a title="apiclient.http
+oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-149', 'http', 'link-47');">http</a></tt> <tt class="py-keyword">is</tt> <tt class="py-name">None</tt><tt class="py-op">:</tt> </tt>
+<a name="L1128"></a><tt class="py-lineno">1128</tt>  <tt class="py-line">      <tt id="link-150" class="py-name"><a title="apiclient.http
+oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-150', 'http', 'link-47');">http</a></tt> <tt class="py-op">=</tt> <tt class="py-name">httplib2</tt><tt class="py-op">.</tt><tt class="py-name">Http</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L1129"></a><tt class="py-lineno">1129</tt>  <tt class="py-line"> </tt>
-<a name="L1130"></a><tt class="py-lineno">1130</tt>  <tt class="py-line">    <tt class="py-name">resp</tt><tt class="py-op">,</tt> <tt class="py-name">content</tt> <tt class="py-op">=</tt> <tt id="link-150" class="py-name"><a title="apiclient.http
-oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-150', 'http', 'link-47');">http</a></tt><tt class="py-op">.</tt><tt id="link-151" class="py-name"><a title="apiclient.http.HttpMock.request
+<a name="L1130"></a><tt class="py-lineno">1130</tt>  <tt class="py-line">    <tt class="py-name">resp</tt><tt class="py-op">,</tt> <tt class="py-name">content</tt> <tt class="py-op">=</tt> <tt id="link-151" class="py-name"><a title="apiclient.http
+oauth2client.appengine.OAuth2Decorator.http" class="py-name" href="#" onclick="return doclink('link-151', 'http', 'link-47');">http</a></tt><tt class="py-op">.</tt><tt id="link-152" class="py-name"><a title="apiclient.http.HttpMock.request
 apiclient.http.HttpMockSequence.request
 apiclient.model.BaseModel.request
-apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-151', 'request', 'link-48');">request</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">token_uri</tt><tt class="py-op">,</tt> <tt class="py-name">method</tt><tt class="py-op">=</tt><tt class="py-string">'POST'</tt><tt class="py-op">,</tt> <tt class="py-name">body</tt><tt class="py-op">=</tt><tt class="py-name">body</tt><tt class="py-op">,</tt> </tt>
+apiclient.model.Model.request" class="py-name" href="#" onclick="return doclink('link-152', 'request', 'link-48');">request</a></tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">token_uri</tt><tt class="py-op">,</tt> <tt class="py-name">method</tt><tt class="py-op">=</tt><tt class="py-string">'POST'</tt><tt class="py-op">,</tt> <tt class="py-name">body</tt><tt class="py-op">=</tt><tt class="py-name">body</tt><tt class="py-op">,</tt> </tt>
 <a name="L1131"></a><tt class="py-lineno">1131</tt>  <tt class="py-line">                                 <tt class="py-name">headers</tt><tt class="py-op">=</tt><tt class="py-name">headers</tt><tt class="py-op">)</tt> </tt>
-<a name="L1132"></a><tt class="py-lineno">1132</tt>  <tt class="py-line">    <tt class="py-name">d</tt> <tt class="py-op">=</tt> <tt id="link-152" class="py-name" targets="Function oauth2client.client._parse_exchange_token_response()=oauth2client.client-module.html#_parse_exchange_token_response"><a title="oauth2client.client._parse_exchange_token_response" class="py-name" href="#" onclick="return doclink('link-152', '_parse_exchange_token_response', 'link-152');">_parse_exchange_token_response</a></tt><tt class="py-op">(</tt><tt class="py-name">content</tt><tt class="py-op">)</tt> </tt>
+<a name="L1132"></a><tt class="py-lineno">1132</tt>  <tt class="py-line">    <tt class="py-name">d</tt> <tt class="py-op">=</tt> <tt id="link-153" class="py-name" targets="Function oauth2client.client._parse_exchange_token_response()=oauth2client.client-module.html#_parse_exchange_token_response"><a title="oauth2client.client._parse_exchange_token_response" class="py-name" href="#" onclick="return doclink('link-153', '_parse_exchange_token_response', 'link-153');">_parse_exchange_token_response</a></tt><tt class="py-op">(</tt><tt class="py-name">content</tt><tt class="py-op">)</tt> </tt>
 <a name="L1133"></a><tt class="py-lineno">1133</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">resp</tt><tt class="py-op">.</tt><tt class="py-name">status</tt> <tt class="py-op">==</tt> <tt class="py-number">200</tt> <tt class="py-keyword">and</tt> <tt class="py-string">'access_token'</tt> <tt class="py-keyword">in</tt> <tt class="py-name">d</tt><tt class="py-op">:</tt> </tt>
 <a name="L1134"></a><tt class="py-lineno">1134</tt>  <tt class="py-line">      <tt class="py-name">access_token</tt> <tt class="py-op">=</tt> <tt class="py-name">d</tt><tt class="py-op">[</tt><tt class="py-string">'access_token'</tt><tt class="py-op">]</tt> </tt>
-<a name="L1135"></a><tt class="py-lineno">1135</tt>  <tt class="py-line">      <tt class="py-name">refresh_token</tt> <tt class="py-op">=</tt> <tt class="py-name">d</tt><tt class="py-op">.</tt><tt id="link-153" class="py-name"><a title="apiclient.schema.Schemas.get
+<a name="L1135"></a><tt class="py-lineno">1135</tt>  <tt class="py-line">      <tt class="py-name">refresh_token</tt> <tt class="py-op">=</tt> <tt class="py-name">d</tt><tt class="py-op">.</tt><tt id="link-154" class="py-name"><a title="apiclient.schema.Schemas.get
 oauth2client.client.MemoryCache.get
-oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-153', 'get', 'link-20');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'refresh_token'</tt><tt class="py-op">,</tt> <tt class="py-name">None</tt><tt class="py-op">)</tt> </tt>
+oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-154', 'get', 'link-20');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'refresh_token'</tt><tt class="py-op">,</tt> <tt class="py-name">None</tt><tt class="py-op">)</tt> </tt>
 <a name="L1136"></a><tt class="py-lineno">1136</tt>  <tt class="py-line">      <tt class="py-name">token_expiry</tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
 <a name="L1137"></a><tt class="py-lineno">1137</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-string">'expires_in'</tt> <tt class="py-keyword">in</tt> <tt class="py-name">d</tt><tt class="py-op">:</tt> </tt>
 <a name="L1138"></a><tt class="py-lineno">1138</tt>  <tt class="py-line">        <tt class="py-name">token_expiry</tt> <tt class="py-op">=</tt> <tt class="py-name">datetime</tt><tt class="py-op">.</tt><tt class="py-name">datetime</tt><tt class="py-op">.</tt><tt class="py-name">utcnow</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> <tt class="py-op">+</tt> <tt class="py-name">datetime</tt><tt class="py-op">.</tt><tt class="py-name">timedelta</tt><tt class="py-op">(</tt> </tt>
 <a name="L1139"></a><tt class="py-lineno">1139</tt>  <tt class="py-line">            <tt class="py-name">seconds</tt><tt class="py-op">=</tt><tt class="py-name">int</tt><tt class="py-op">(</tt><tt class="py-name">d</tt><tt class="py-op">[</tt><tt class="py-string">'expires_in'</tt><tt class="py-op">]</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L1140"></a><tt class="py-lineno">1140</tt>  <tt class="py-line"> </tt>
 <a name="L1141"></a><tt class="py-lineno">1141</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-string">'id_token'</tt> <tt class="py-keyword">in</tt> <tt class="py-name">d</tt><tt class="py-op">:</tt> </tt>
-<a name="L1142"></a><tt class="py-lineno">1142</tt>  <tt class="py-line">        <tt class="py-name">d</tt><tt class="py-op">[</tt><tt class="py-string">'id_token'</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt id="link-154" class="py-name" targets="Function oauth2client.client._extract_id_token()=oauth2client.client-module.html#_extract_id_token"><a title="oauth2client.client._extract_id_token" class="py-name" href="#" onclick="return doclink('link-154', '_extract_id_token', 'link-154');">_extract_id_token</a></tt><tt class="py-op">(</tt><tt class="py-name">d</tt><tt class="py-op">[</tt><tt class="py-string">'id_token'</tt><tt class="py-op">]</tt><tt class="py-op">)</tt> </tt>
+<a name="L1142"></a><tt class="py-lineno">1142</tt>  <tt class="py-line">        <tt class="py-name">d</tt><tt class="py-op">[</tt><tt class="py-string">'id_token'</tt><tt class="py-op">]</tt> <tt class="py-op">=</tt> <tt id="link-155" class="py-name" targets="Function oauth2client.client._extract_id_token()=oauth2client.client-module.html#_extract_id_token"><a title="oauth2client.client._extract_id_token" class="py-name" href="#" onclick="return doclink('link-155', '_extract_id_token', 'link-155');">_extract_id_token</a></tt><tt class="py-op">(</tt><tt class="py-name">d</tt><tt class="py-op">[</tt><tt class="py-string">'id_token'</tt><tt class="py-op">]</tt><tt class="py-op">)</tt> </tt>
 <a name="L1143"></a><tt class="py-lineno">1143</tt>  <tt class="py-line"> </tt>
-<a name="L1144"></a><tt class="py-lineno">1144</tt>  <tt class="py-line">      <tt id="link-155" class="py-name"><a title="apiclient.discovery.logger
+<a name="L1144"></a><tt class="py-lineno">1144</tt>  <tt class="py-line">      <tt id="link-156" class="py-name"><a title="apiclient.discovery.logger
 oauth2client.appengine.logger
 oauth2client.client.logger
 oauth2client.crypt.logger
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-155', 'logger', 'link-16');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">'Successfully retrieved access token'</tt><tt class="py-op">)</tt> </tt>
-<a name="L1145"></a><tt class="py-lineno">1145</tt>  <tt class="py-line">      <tt class="py-keyword">return</tt> <tt id="link-156" class="py-name"><a title="oauth2client.client.OAuth2Credentials" class="py-name" href="#" onclick="return doclink('link-156', 'OAuth2Credentials', 'link-69');">OAuth2Credentials</a></tt><tt class="py-op">(</tt><tt class="py-name">access_token</tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">client_id</tt><tt class="py-op">,</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-156', 'logger', 'link-16');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">'Successfully retrieved access token'</tt><tt class="py-op">)</tt> </tt>
+<a name="L1145"></a><tt class="py-lineno">1145</tt>  <tt class="py-line">      <tt class="py-keyword">return</tt> <tt id="link-157" class="py-name"><a title="oauth2client.client.OAuth2Credentials" class="py-name" href="#" onclick="return doclink('link-157', 'OAuth2Credentials', 'link-69');">OAuth2Credentials</a></tt><tt class="py-op">(</tt><tt class="py-name">access_token</tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">client_id</tt><tt class="py-op">,</tt> </tt>
 <a name="L1146"></a><tt class="py-lineno">1146</tt>  <tt class="py-line">                               <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">client_secret</tt><tt class="py-op">,</tt> <tt class="py-name">refresh_token</tt><tt class="py-op">,</tt> <tt class="py-name">token_expiry</tt><tt class="py-op">,</tt> </tt>
 <a name="L1147"></a><tt class="py-lineno">1147</tt>  <tt class="py-line">                               <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">token_uri</tt><tt class="py-op">,</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">user_agent</tt><tt class="py-op">,</tt> </tt>
-<a name="L1148"></a><tt class="py-lineno">1148</tt>  <tt class="py-line">                               <tt class="py-name">id_token</tt><tt class="py-op">=</tt><tt class="py-name">d</tt><tt class="py-op">.</tt><tt id="link-157" class="py-name"><a title="apiclient.schema.Schemas.get
+<a name="L1148"></a><tt class="py-lineno">1148</tt>  <tt class="py-line">                               <tt class="py-name">id_token</tt><tt class="py-op">=</tt><tt class="py-name">d</tt><tt class="py-op">.</tt><tt id="link-158" class="py-name"><a title="apiclient.schema.Schemas.get
 oauth2client.client.MemoryCache.get
-oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-157', 'get', 'link-20');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'id_token'</tt><tt class="py-op">,</tt> <tt class="py-name">None</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
+oauth2client.client.Storage.get" class="py-name" href="#" onclick="return doclink('link-158', 'get', 'link-20');">get</a></tt><tt class="py-op">(</tt><tt class="py-string">'id_token'</tt><tt class="py-op">,</tt> <tt class="py-name">None</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L1149"></a><tt class="py-lineno">1149</tt>  <tt class="py-line">    <tt class="py-keyword">else</tt><tt class="py-op">:</tt> </tt>
-<a name="L1150"></a><tt class="py-lineno">1150</tt>  <tt class="py-line">      <tt id="link-158" class="py-name"><a title="apiclient.discovery.logger
+<a name="L1150"></a><tt class="py-lineno">1150</tt>  <tt class="py-line">      <tt id="link-159" class="py-name"><a title="apiclient.discovery.logger
 oauth2client.appengine.logger
 oauth2client.client.logger
 oauth2client.crypt.logger
 oauth2client.gce.logger
 oauth2client.locked_file.logger
 oauth2client.multistore_file.logger
-oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-158', 'logger', 'link-16');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">'Failed to retrieve access token: %s'</tt> <tt class="py-op">%</tt> <tt class="py-name">content</tt><tt class="py-op">)</tt> </tt>
+oauth2client.util.logger" class="py-name" href="#" onclick="return doclink('link-159', 'logger', 'link-16');">logger</a></tt><tt class="py-op">.</tt><tt class="py-name">info</tt><tt class="py-op">(</tt><tt class="py-string">'Failed to retrieve access token: %s'</tt> <tt class="py-op">%</tt> <tt class="py-name">content</tt><tt class="py-op">)</tt> </tt>
 <a name="L1151"></a><tt class="py-lineno">1151</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-string">'error'</tt> <tt class="py-keyword">in</tt> <tt class="py-name">d</tt><tt class="py-op">:</tt> </tt>
 <a name="L1152"></a><tt class="py-lineno">1152</tt>  <tt class="py-line">        <tt class="py-comment"># you never know what those providers got to say</tt> </tt>
 <a name="L1153"></a><tt class="py-lineno">1153</tt>  <tt class="py-line">        <tt class="py-name">error_msg</tt> <tt class="py-op">=</tt> <tt class="py-name">unicode</tt><tt class="py-op">(</tt><tt class="py-name">d</tt><tt class="py-op">[</tt><tt class="py-string">'error'</tt><tt class="py-op">]</tt><tt class="py-op">)</tt> </tt>
 <a name="L1154"></a><tt class="py-lineno">1154</tt>  <tt class="py-line">      <tt class="py-keyword">else</tt><tt class="py-op">:</tt> </tt>
 <a name="L1155"></a><tt class="py-lineno">1155</tt>  <tt class="py-line">        <tt class="py-name">error_msg</tt> <tt class="py-op">=</tt> <tt class="py-string">'Invalid response: %s.'</tt> <tt class="py-op">%</tt> <tt class="py-name">str</tt><tt class="py-op">(</tt><tt class="py-name">resp</tt><tt class="py-op">.</tt><tt class="py-name">status</tt><tt class="py-op">)</tt> </tt>
-<a name="L1156"></a><tt class="py-lineno">1156</tt>  <tt class="py-line">      <tt class="py-keyword">raise</tt> <tt id="link-159" class="py-name"><a title="oauth2client.client.FlowExchangeError" class="py-name" href="#" onclick="return doclink('link-159', 'FlowExchangeError', 'link-147');">FlowExchangeError</a></tt><tt class="py-op">(</tt><tt class="py-name">error_msg</tt><tt class="py-op">)</tt> </tt>
+<a name="L1156"></a><tt class="py-lineno">1156</tt>  <tt class="py-line">      <tt class="py-keyword">raise</tt> <tt id="link-160" class="py-name"><a title="oauth2client.client.FlowExchangeError" class="py-name" href="#" onclick="return doclink('link-160', 'FlowExchangeError', 'link-148');">FlowExchangeError</a></tt><tt class="py-op">(</tt><tt class="py-name">error_msg</tt><tt class="py-op">)</tt> </tt>
 </div></div><a name="L1157"></a><tt class="py-lineno">1157</tt>  <tt class="py-line"> </tt>
 <a name="flow_from_clientsecrets"></a><div id="flow_from_clientsecrets-def"><a name="L1158"></a><tt class="py-lineno">1158</tt>  <tt class="py-line"> </tt>
-<a name="L1159"></a><tt class="py-lineno">1159</tt>  <tt class="py-line"><tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-160" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-160', 'positional', 'link-46');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">2</tt><tt class="py-op">)</tt> </tt>
+<a name="L1159"></a><tt class="py-lineno">1159</tt>  <tt class="py-line"><tt class="py-decorator">@</tt><tt class="py-decorator">util</tt><tt class="py-op">.</tt><tt id="link-161" class="py-name"><a title="oauth2client.util.positional" class="py-name" href="#" onclick="return doclink('link-161', 'positional', 'link-46');">positional</a></tt><tt class="py-op">(</tt><tt class="py-number">2</tt><tt class="py-op">)</tt> </tt>
 <a name="L1160"></a><tt class="py-lineno">1160</tt> <a class="py-toggle" href="#" id="flow_from_clientsecrets-toggle" onclick="return toggle('flow_from_clientsecrets');">-</a><tt class="py-line"><tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.client-module.html#flow_from_clientsecrets">flow_from_clientsecrets</a><tt class="py-op">(</tt><tt class="py-param">filename</tt><tt class="py-op">,</tt> <tt class="py-param">scope</tt><tt class="py-op">,</tt> <tt class="py-param">redirect_uri</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">,</tt> <tt class="py-param">message</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">,</tt> <tt class="py-param">cache</tt><tt class="py-op">=</tt><tt class="py-name">None</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="flow_from_clientsecrets-collapsed" style="display:none;" pad="++++" indent="++++"></div><div id="flow_from_clientsecrets-expanded"><a name="L1161"></a><tt class="py-lineno">1161</tt>  <tt class="py-line">  <tt class="py-docstring">"""Create a Flow from a clientsecrets file.</tt> </tt>
 <a name="L1162"></a><tt class="py-lineno">1162</tt>  <tt class="py-line"><tt class="py-docstring"></tt> </tt>
@@ -1581,10 +1581,10 @@
 <a name="L1185"></a><tt class="py-lineno">1185</tt>  <tt class="py-line"><tt class="py-docstring">      invalid.</tt> </tt>
 <a name="L1186"></a><tt class="py-lineno">1186</tt>  <tt class="py-line"><tt class="py-docstring">  """</tt> </tt>
 <a name="L1187"></a><tt class="py-lineno">1187</tt>  <tt class="py-line">  <tt class="py-keyword">try</tt><tt class="py-op">:</tt> </tt>
-<a name="L1188"></a><tt class="py-lineno">1188</tt>  <tt class="py-line">    <tt class="py-name">client_type</tt><tt class="py-op">,</tt> <tt class="py-name">client_info</tt> <tt class="py-op">=</tt> <tt id="link-161" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-161', 'clientsecrets', 'link-0');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-162" class="py-name" targets="Function oauth2client.clientsecrets.loadfile()=oauth2client.clientsecrets-module.html#loadfile"><a title="oauth2client.clientsecrets.loadfile" class="py-name" href="#" onclick="return doclink('link-162', 'loadfile', 'link-162');">loadfile</a></tt><tt class="py-op">(</tt><tt id="link-163" class="py-name"><a title="oauth2client.locked_file.LockedFile.filename
-oauth2client.locked_file._Opener.filename" class="py-name" href="#" onclick="return doclink('link-163', 'filename', 'link-137');">filename</a></tt><tt class="py-op">,</tt> <tt class="py-name">cache</tt><tt class="py-op">=</tt><tt class="py-name">cache</tt><tt class="py-op">)</tt> </tt>
-<a name="L1189"></a><tt class="py-lineno">1189</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">client_type</tt> <tt class="py-keyword">in</tt> <tt class="py-op">[</tt><tt id="link-164" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-164', 'clientsecrets', 'link-0');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-165" class="py-name" targets="Variable oauth2client.clientsecrets.TYPE_WEB=oauth2client.clientsecrets-module.html#TYPE_WEB"><a title="oauth2client.clientsecrets.TYPE_WEB" class="py-name" href="#" onclick="return doclink('link-165', 'TYPE_WEB', 'link-165');">TYPE_WEB</a></tt><tt class="py-op">,</tt> <tt id="link-166" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-166', 'clientsecrets', 'link-0');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-167" class="py-name" targets="Variable oauth2client.clientsecrets.TYPE_INSTALLED=oauth2client.clientsecrets-module.html#TYPE_INSTALLED"><a title="oauth2client.clientsecrets.TYPE_INSTALLED" class="py-name" href="#" onclick="return doclink('link-167', 'TYPE_INSTALLED', 'link-167');">TYPE_INSTALLED</a></tt><tt class="py-op">]</tt><tt class="py-op">:</tt> </tt>
-<a name="L1190"></a><tt class="py-lineno">1190</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt id="link-168" class="py-name"><a title="oauth2client.client.OAuth2WebServerFlow" class="py-name" href="#" onclick="return doclink('link-168', 'OAuth2WebServerFlow', 'link-130');">OAuth2WebServerFlow</a></tt><tt class="py-op">(</tt> </tt>
+<a name="L1188"></a><tt class="py-lineno">1188</tt>  <tt class="py-line">    <tt class="py-name">client_type</tt><tt class="py-op">,</tt> <tt class="py-name">client_info</tt> <tt class="py-op">=</tt> <tt id="link-162" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-162', 'clientsecrets', 'link-0');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-163" class="py-name" targets="Function oauth2client.clientsecrets.loadfile()=oauth2client.clientsecrets-module.html#loadfile"><a title="oauth2client.clientsecrets.loadfile" class="py-name" href="#" onclick="return doclink('link-163', 'loadfile', 'link-163');">loadfile</a></tt><tt class="py-op">(</tt><tt id="link-164" class="py-name"><a title="oauth2client.locked_file.LockedFile.filename
+oauth2client.locked_file._Opener.filename" class="py-name" href="#" onclick="return doclink('link-164', 'filename', 'link-138');">filename</a></tt><tt class="py-op">,</tt> <tt class="py-name">cache</tt><tt class="py-op">=</tt><tt class="py-name">cache</tt><tt class="py-op">)</tt> </tt>
+<a name="L1189"></a><tt class="py-lineno">1189</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">client_type</tt> <tt class="py-keyword">in</tt> <tt class="py-op">[</tt><tt id="link-165" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-165', 'clientsecrets', 'link-0');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-166" class="py-name" targets="Variable oauth2client.clientsecrets.TYPE_WEB=oauth2client.clientsecrets-module.html#TYPE_WEB"><a title="oauth2client.clientsecrets.TYPE_WEB" class="py-name" href="#" onclick="return doclink('link-166', 'TYPE_WEB', 'link-166');">TYPE_WEB</a></tt><tt class="py-op">,</tt> <tt id="link-167" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-167', 'clientsecrets', 'link-0');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-168" class="py-name" targets="Variable oauth2client.clientsecrets.TYPE_INSTALLED=oauth2client.clientsecrets-module.html#TYPE_INSTALLED"><a title="oauth2client.clientsecrets.TYPE_INSTALLED" class="py-name" href="#" onclick="return doclink('link-168', 'TYPE_INSTALLED', 'link-168');">TYPE_INSTALLED</a></tt><tt class="py-op">]</tt><tt class="py-op">:</tt> </tt>
+<a name="L1190"></a><tt class="py-lineno">1190</tt>  <tt class="py-line">        <tt class="py-keyword">return</tt> <tt id="link-169" class="py-name"><a title="oauth2client.client.OAuth2WebServerFlow" class="py-name" href="#" onclick="return doclink('link-169', 'OAuth2WebServerFlow', 'link-130');">OAuth2WebServerFlow</a></tt><tt class="py-op">(</tt> </tt>
 <a name="L1191"></a><tt class="py-lineno">1191</tt>  <tt class="py-line">            <tt class="py-name">client_info</tt><tt class="py-op">[</tt><tt class="py-string">'client_id'</tt><tt class="py-op">]</tt><tt class="py-op">,</tt> </tt>
 <a name="L1192"></a><tt class="py-lineno">1192</tt>  <tt class="py-line">            <tt class="py-name">client_info</tt><tt class="py-op">[</tt><tt class="py-string">'client_secret'</tt><tt class="py-op">]</tt><tt class="py-op">,</tt> </tt>
 <a name="L1193"></a><tt class="py-lineno">1193</tt>  <tt class="py-line">            <tt class="py-name">scope</tt><tt class="py-op">,</tt> </tt>
@@ -1593,14 +1593,14 @@
 <a name="L1196"></a><tt class="py-lineno">1196</tt>  <tt class="py-line">            <tt class="py-name">auth_uri</tt><tt class="py-op">=</tt><tt class="py-name">client_info</tt><tt class="py-op">[</tt><tt class="py-string">'auth_uri'</tt><tt class="py-op">]</tt><tt class="py-op">,</tt> </tt>
 <a name="L1197"></a><tt class="py-lineno">1197</tt>  <tt class="py-line">            <tt class="py-name">token_uri</tt><tt class="py-op">=</tt><tt class="py-name">client_info</tt><tt class="py-op">[</tt><tt class="py-string">'token_uri'</tt><tt class="py-op">]</tt><tt class="py-op">)</tt> </tt>
 <a name="L1198"></a><tt class="py-lineno">1198</tt>  <tt class="py-line"> </tt>
-<a name="L1199"></a><tt class="py-lineno">1199</tt>  <tt class="py-line">  <tt class="py-keyword">except</tt> <tt id="link-169" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-169', 'clientsecrets', 'link-0');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-170" class="py-name" targets="Class oauth2client.appengine.InvalidClientSecretsError=oauth2client.appengine.InvalidClientSecretsError-class.html,Class oauth2client.clientsecrets.InvalidClientSecretsError=oauth2client.clientsecrets.InvalidClientSecretsError-class.html"><a title="oauth2client.appengine.InvalidClientSecretsError
-oauth2client.clientsecrets.InvalidClientSecretsError" class="py-name" href="#" onclick="return doclink('link-170', 'InvalidClientSecretsError', 'link-170');">InvalidClientSecretsError</a></tt><tt class="py-op">:</tt> </tt>
+<a name="L1199"></a><tt class="py-lineno">1199</tt>  <tt class="py-line">  <tt class="py-keyword">except</tt> <tt id="link-170" class="py-name"><a title="oauth2client.clientsecrets" class="py-name" href="#" onclick="return doclink('link-170', 'clientsecrets', 'link-0');">clientsecrets</a></tt><tt class="py-op">.</tt><tt id="link-171" class="py-name" targets="Class oauth2client.appengine.InvalidClientSecretsError=oauth2client.appengine.InvalidClientSecretsError-class.html,Class oauth2client.clientsecrets.InvalidClientSecretsError=oauth2client.clientsecrets.InvalidClientSecretsError-class.html"><a title="oauth2client.appengine.InvalidClientSecretsError
+oauth2client.clientsecrets.InvalidClientSecretsError" class="py-name" href="#" onclick="return doclink('link-171', 'InvalidClientSecretsError', 'link-171');">InvalidClientSecretsError</a></tt><tt class="py-op">:</tt> </tt>
 <a name="L1200"></a><tt class="py-lineno">1200</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-name">message</tt><tt class="py-op">:</tt> </tt>
 <a name="L1201"></a><tt class="py-lineno">1201</tt>  <tt class="py-line">      <tt class="py-name">sys</tt><tt class="py-op">.</tt><tt class="py-name">exit</tt><tt class="py-op">(</tt><tt class="py-name">message</tt><tt class="py-op">)</tt> </tt>
 <a name="L1202"></a><tt class="py-lineno">1202</tt>  <tt class="py-line">    <tt class="py-keyword">else</tt><tt class="py-op">:</tt> </tt>
 <a name="L1203"></a><tt class="py-lineno">1203</tt>  <tt class="py-line">      <tt class="py-keyword">raise</tt> </tt>
 <a name="L1204"></a><tt class="py-lineno">1204</tt>  <tt class="py-line">  <tt class="py-keyword">else</tt><tt class="py-op">:</tt> </tt>
-<a name="L1205"></a><tt class="py-lineno">1205</tt>  <tt class="py-line">    <tt class="py-keyword">raise</tt> <tt id="link-171" class="py-name" targets="Class oauth2client.client.UnknownClientSecretsFlowError=oauth2client.client.UnknownClientSecretsFlowError-class.html"><a title="oauth2client.client.UnknownClientSecretsFlowError" class="py-name" href="#" onclick="return doclink('link-171', 'UnknownClientSecretsFlowError', 'link-171');">UnknownClientSecretsFlowError</a></tt><tt class="py-op">(</tt> </tt>
+<a name="L1205"></a><tt class="py-lineno">1205</tt>  <tt class="py-line">    <tt class="py-keyword">raise</tt> <tt id="link-172" class="py-name" targets="Class oauth2client.client.UnknownClientSecretsFlowError=oauth2client.client.UnknownClientSecretsFlowError-class.html"><a title="oauth2client.client.UnknownClientSecretsFlowError" class="py-name" href="#" onclick="return doclink('link-172', 'UnknownClientSecretsFlowError', 'link-172');">UnknownClientSecretsFlowError</a></tt><tt class="py-op">(</tt> </tt>
 <a name="L1206"></a><tt class="py-lineno">1206</tt>  <tt class="py-line">        <tt class="py-string">'This OAuth 2.0 flow is unsupported: "%s"'</tt> <tt class="py-op">*</tt> <tt class="py-name">client_type</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L1207"></a><tt class="py-lineno">1207</tt>  <tt class="py-line"> </tt><script type="text/javascript">
 <!--
@@ -1632,7 +1632,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.AccessTokenCredentials-class.html b/docs/epy/oauth2client.client.AccessTokenCredentials-class.html
index 8924f04..0f8f56c 100644
--- a/docs/epy/oauth2client.client.AccessTokenCredentials-class.html
+++ b/docs/epy/oauth2client.client.AccessTokenCredentials-class.html
@@ -56,9 +56,9 @@
 <h1 class="epydoc">Class AccessTokenCredentials</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#AccessTokenCredentials">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_accesstoke" name="class_hierarchy_for_accesstoke">
-<area shape="rect" href="oauth2client.client.AccessTokenCredentials-class.html" title="AccessTokenCredentials" alt="" coords="5,117,168,144"/>
-<area shape="rect" href="oauth2client.client.Credentials-class.html" title="Credentials" alt="" coords="44,5,129,32"/>
-<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="OAuth2Credentials" alt="" coords="21,61,152,88"/>
+<area shape="rect" href="oauth2client.client.AccessTokenCredentials-class.html" title="AccessTokenCredentials" alt="" coords="5,5,168,32"/>
+<area shape="rect" href="oauth2client.client.Credentials-class.html" title="Credentials" alt="" coords="192,5,277,32"/>
+<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="OAuth2Credentials" alt="" coords="301,5,432,32"/>
 </map>
   <img src="class_hierarchy_for_accesstoke.gif" alt='' usemap="#class_hierarchy_for_accesstoke" ismap="ismap" class="graph-without-title" />
 </center>
@@ -149,6 +149,7 @@
     <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a></code></b>:
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#__getstate__">__getstate__</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#__setstate__">__setstate__</a></code>,
+      <code><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#apply">apply</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#authorize">authorize</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#refresh">refresh</a></code>,
@@ -268,9 +269,6 @@
 </tr>
   <tr>
     <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a></code></b>:
-      <code><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a></code>
-      </p>
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
       <code>__class__</code>
       </p>
@@ -431,7 +429,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.AccessTokenCredentialsError-class.html b/docs/epy/oauth2client.client.AccessTokenCredentialsError-class.html
index 245cd8d..234db0b 100644
--- a/docs/epy/oauth2client.client.AccessTokenCredentialsError-class.html
+++ b/docs/epy/oauth2client.client.AccessTokenCredentialsError-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class AccessTokenCredentialsError</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#AccessTokenCredentialsError">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_accesstoke_2" name="class_hierarchy_for_accesstoke_2">
-<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="13,5,189,32"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="28,61,175,88"/>
-<area shape="rect" href="oauth2client.client.Error-class.html" title="Error" alt="" coords="77,117,125,144"/>
-<area shape="rect" href="oauth2client.client.AccessTokenCredentialsError-class.html" title="AccessTokenCredentialsError" alt="" coords="5,173,197,200"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
+<area shape="rect" href="oauth2client.client.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
+<area shape="rect" href="oauth2client.client.AccessTokenCredentialsError-class.html" title="AccessTokenCredentialsError" alt="" coords="205,5,397,32"/>
 </map>
   <img src="class_hierarchy_for_accesstoke_2.gif" alt='' usemap="#class_hierarchy_for_accesstoke_2" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.AccessTokenRefreshError-class.html b/docs/epy/oauth2client.client.AccessTokenRefreshError-class.html
index 70c7748..286ba91 100644
--- a/docs/epy/oauth2client.client.AccessTokenRefreshError-class.html
+++ b/docs/epy/oauth2client.client.AccessTokenRefreshError-class.html
@@ -59,7 +59,7 @@
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 <area shape="rect" href="oauth2client.client.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="oauth2client.client.AccessTokenRefreshError-class.html" title="AccessTokenRefreshError" alt="" coords="8,173,179,200"/>
+<area shape="rect" href="oauth2client.client.AccessTokenRefreshError-class.html" title="AccessTokenRefreshError" alt="" coords="205,5,376,32"/>
 </map>
   <img src="class_hierarchy_for_accesstoke_3.gif" alt='' usemap="#class_hierarchy_for_accesstoke_3" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.AssertionCredentials-class.html b/docs/epy/oauth2client.client.AssertionCredentials-class.html
index ea4ed37..9cd0be5 100644
--- a/docs/epy/oauth2client.client.AssertionCredentials-class.html
+++ b/docs/epy/oauth2client.client.AssertionCredentials-class.html
@@ -56,12 +56,9 @@
 <h1 class="epydoc">Class AssertionCredentials</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#AssertionCredentials">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_assertionc" name="class_hierarchy_for_assertionc">
-<area shape="rect" href="oauth2client.appengine.AppAssertionCredentials-class.html" title="appengine.AppAssertionCredentials" alt="" coords="5,173,232,200"/>
-<area shape="rect" href="oauth2client.client.AssertionCredentials-class.html" title="AssertionCredentials" alt="" coords="285,117,427,144"/>
-<area shape="rect" href="oauth2client.client.SignedJwtAssertionCredentials-class.html" title="SignedJwtAssertionCredentials" alt="" coords="256,173,456,200"/>
-<area shape="rect" href="oauth2client.gce.AppAssertionCredentials-class.html" title="gce.AppAssertionCredentials" alt="" coords="480,173,669,200"/>
-<area shape="rect" href="oauth2client.client.Credentials-class.html" title="Credentials" alt="" coords="313,5,399,32"/>
-<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="OAuth2Credentials" alt="" coords="291,61,421,88"/>
+<area shape="rect" href="oauth2client.client.AssertionCredentials-class.html" title="AssertionCredentials" alt="" coords="5,5,147,32"/>
+<area shape="rect" href="oauth2client.client.Credentials-class.html" title="Credentials" alt="" coords="171,5,256,32"/>
+<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="OAuth2Credentials" alt="" coords="280,5,411,32"/>
 </map>
   <img src="class_hierarchy_for_assertionc.gif" alt='' usemap="#class_hierarchy_for_assertionc" ismap="ismap" class="graph-without-title" />
 </center>
@@ -102,11 +99,14 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.client.AssertionCredentials-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 />
+          <td><span class="summary-sig"><a href="oauth2client.client.AssertionCredentials-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">assertion_type</span>,
+        <span class="summary-sig-arg">user_agent</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">token_uri</span>=<span class="summary-sig-default">'https://accounts.google.com/o/oauth2/token'</span>,
+        <span class="summary-sig-arg">**unused_kwargs</span>)</span><br />
       Constructor for AssertionFlowCredentials.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#AssertionCredentials.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -154,6 +154,7 @@
     <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a></code></b>:
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#__getstate__">__getstate__</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#__setstate__">__setstate__</a></code>,
+      <code><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#apply">apply</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#authorize">authorize</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#refresh">refresh</a></code>,
@@ -258,9 +259,6 @@
 </tr>
   <tr>
     <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a></code></b>:
-      <code><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a></code>
-      </p>
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
       <code>__class__</code>
       </p>
@@ -292,12 +290,15 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">assertion_type</span>,
+        <span class="sig-arg">user_agent</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">token_uri</span>=<span class="sig-default">'https://accounts.google.com/o/oauth2/token'</span>,
+        <span class="sig-arg">**unused_kwargs</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#AssertionCredentials.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -373,7 +374,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.Credentials-class.html b/docs/epy/oauth2client.client.Credentials-class.html
index a0d862f..7368349 100644
--- a/docs/epy/oauth2client.client.Credentials-class.html
+++ b/docs/epy/oauth2client.client.Credentials-class.html
@@ -56,13 +56,7 @@
 <h1 class="epydoc">Class Credentials</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#Credentials">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_credential_3" name="class_hierarchy_for_credential_3">
-<area shape="rect" href="oauth2client.appengine.AppAssertionCredentials-class.html" title="appengine.AppAssertionCredentials" alt="" coords="5,173,232,200"/>
-<area shape="rect" href="oauth2client.client.AccessTokenCredentials-class.html" title="AccessTokenCredentials" alt="" coords="99,117,261,144"/>
-<area shape="rect" href="oauth2client.client.AssertionCredentials-class.html" title="AssertionCredentials" alt="" coords="285,117,427,144"/>
-<area shape="rect" href="oauth2client.client.SignedJwtAssertionCredentials-class.html" title="SignedJwtAssertionCredentials" alt="" coords="256,173,456,200"/>
-<area shape="rect" href="oauth2client.gce.AppAssertionCredentials-class.html" title="gce.AppAssertionCredentials" alt="" coords="480,173,669,200"/>
-<area shape="rect" href="oauth2client.client.Credentials-class.html" title="Credentials" alt="" coords="225,5,311,32"/>
-<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="OAuth2Credentials" alt="" coords="203,61,333,88"/>
+<area shape="rect" href="oauth2client.client.Credentials-class.html" title="Credentials" alt="" coords="5,5,91,32"/>
 </map>
   <img src="class_hierarchy_for_credential_3.gif" alt='' usemap="#class_hierarchy_for_credential_3" ismap="ismap" class="graph-without-title" />
 </center>
@@ -285,7 +279,7 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="NON_SERIALIZED_MEMBERS"></a><span class="summary-name">NON_SERIALIZED_MEMBERS</span> = <code title="['store']"><code class="variable-group">[</code><code class="variable-quote">'</code><code class="variable-string">store</code><code class="variable-quote">'</code><code class="variable-group">]</code></code>
+        <a name="NON_SERIALIZED_MEMBERS"></a><span class="summary-name">NON_SERIALIZED_MEMBERS</span> = <code title="['store']">['store']</code>
     </td>
   </tr>
 </table>
@@ -529,7 +523,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.Error-class.html b/docs/epy/oauth2client.client.Error-class.html
index 1637367..713c9de 100644
--- a/docs/epy/oauth2client.client.Error-class.html
+++ b/docs/epy/oauth2client.client.Error-class.html
@@ -56,14 +56,9 @@
 <h1 class="epydoc">Class Error</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#Error">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_error_2" name="class_hierarchy_for_error_2">
-<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="395,5,571,32"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="409,61,556,88"/>
-<area shape="rect" href="oauth2client.client.Error-class.html" title="Error" alt="" coords="459,117,507,144"/>
-<area shape="rect" href="oauth2client.client.AccessTokenCredentialsError-class.html" title="AccessTokenCredentialsError" alt="" coords="5,173,197,200"/>
-<area shape="rect" href="oauth2client.client.AccessTokenRefreshError-class.html" title="AccessTokenRefreshError" alt="" coords="221,173,392,200"/>
-<area shape="rect" href="oauth2client.client.FlowExchangeError-class.html" title="FlowExchangeError" alt="" coords="416,173,549,200"/>
-<area shape="rect" href="oauth2client.client.UnknownClientSecretsFlowError-class.html" title="UnknownClientSecretsFlowError" alt="" coords="573,173,781,200"/>
-<area shape="rect" href="oauth2client.client.VerifyJwtTokenError-class.html" title="VerifyJwtTokenError" alt="" coords="805,173,941,200"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
+<area shape="rect" href="oauth2client.client.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
 </map>
   <img src="class_hierarchy_for_error_2.gif" alt='' usemap="#class_hierarchy_for_error_2" ismap="ismap" class="graph-without-title" />
 </center>
@@ -171,7 +166,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.Flow-class.html b/docs/epy/oauth2client.client.Flow-class.html
index 07d5e39..a0395e7 100644
--- a/docs/epy/oauth2client.client.Flow-class.html
+++ b/docs/epy/oauth2client.client.Flow-class.html
@@ -56,8 +56,7 @@
 <h1 class="epydoc">Class Flow</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#Flow">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_flow" name="class_hierarchy_for_flow">
-<area shape="rect" href="oauth2client.client.Flow-class.html" title="Flow" alt="" coords="59,5,107,32"/>
-<area shape="rect" href="oauth2client.client.OAuth2WebServerFlow-class.html" title="OAuth2WebServerFlow" alt="" coords="5,61,160,88"/>
+<area shape="rect" href="oauth2client.client.Flow-class.html" title="Flow" alt="" coords="5,5,53,32"/>
 </map>
   <img src="class_hierarchy_for_flow.gif" alt='' usemap="#class_hierarchy_for_flow" ismap="ismap" class="graph-without-title" />
 </center>
@@ -153,7 +152,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.FlowExchangeError-class.html b/docs/epy/oauth2client.client.FlowExchangeError-class.html
index 96ec1aa..a55f395 100644
--- a/docs/epy/oauth2client.client.FlowExchangeError-class.html
+++ b/docs/epy/oauth2client.client.FlowExchangeError-class.html
@@ -59,7 +59,7 @@
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 <area shape="rect" href="oauth2client.client.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="oauth2client.client.FlowExchangeError-class.html" title="FlowExchangeError" alt="" coords="27,173,160,200"/>
+<area shape="rect" href="oauth2client.client.FlowExchangeError-class.html" title="FlowExchangeError" alt="" coords="205,5,339,32"/>
 </map>
   <img src="class_hierarchy_for_flowexchan.gif" alt='' usemap="#class_hierarchy_for_flowexchan" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.MemoryCache-class.html b/docs/epy/oauth2client.client.MemoryCache-class.html
index 0129a8a..38f7a09 100644
--- a/docs/epy/oauth2client.client.MemoryCache-class.html
+++ b/docs/epy/oauth2client.client.MemoryCache-class.html
@@ -266,7 +266,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.OAuth2Credentials-class.html b/docs/epy/oauth2client.client.OAuth2Credentials-class.html
index b6728f1..2e70309 100644
--- a/docs/epy/oauth2client.client.OAuth2Credentials-class.html
+++ b/docs/epy/oauth2client.client.OAuth2Credentials-class.html
@@ -56,13 +56,8 @@
 <h1 class="epydoc">Class OAuth2Credentials</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2Credentials">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_oauth2cred" name="class_hierarchy_for_oauth2cred">
-<area shape="rect" href="oauth2client.appengine.AppAssertionCredentials-class.html" title="appengine.AppAssertionCredentials" alt="" coords="5,173,232,200"/>
-<area shape="rect" href="oauth2client.client.AccessTokenCredentials-class.html" title="AccessTokenCredentials" alt="" coords="99,117,261,144"/>
-<area shape="rect" href="oauth2client.client.AssertionCredentials-class.html" title="AssertionCredentials" alt="" coords="285,117,427,144"/>
-<area shape="rect" href="oauth2client.client.SignedJwtAssertionCredentials-class.html" title="SignedJwtAssertionCredentials" alt="" coords="256,173,456,200"/>
-<area shape="rect" href="oauth2client.gce.AppAssertionCredentials-class.html" title="gce.AppAssertionCredentials" alt="" coords="480,173,669,200"/>
-<area shape="rect" href="oauth2client.client.Credentials-class.html" title="Credentials" alt="" coords="225,5,311,32"/>
-<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="OAuth2Credentials" alt="" coords="203,61,333,88"/>
+<area shape="rect" href="oauth2client.client.Credentials-class.html" title="Credentials" alt="" coords="5,5,91,32"/>
+<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="OAuth2Credentials" alt="" coords="115,5,245,32"/>
 </map>
   <img src="class_hierarchy_for_oauth2cred.gif" alt='' usemap="#class_hierarchy_for_oauth2cred" ismap="ismap" class="graph-without-title" />
 </center>
@@ -101,11 +96,18 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.client.OAuth2Credentials-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 />
+          <td><span class="summary-sig"><a href="oauth2client.client.OAuth2Credentials-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">access_token</span>,
+        <span class="summary-sig-arg">client_id</span>,
+        <span class="summary-sig-arg">client_secret</span>,
+        <span class="summary-sig-arg">refresh_token</span>,
+        <span class="summary-sig-arg">token_expiry</span>,
+        <span class="summary-sig-arg">token_uri</span>,
+        <span class="summary-sig-arg">user_agent</span>,
+        <span class="summary-sig-arg">id_token</span>=<span class="summary-sig-default">None</span>)</span><br />
       Create an instance of OAuth2Credentials.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2Credentials.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -190,6 +192,23 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
+          <td><span class="summary-sig"><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired" class="summary-sig-name">access_token_expired</a>(<span class="summary-sig-arg">self</span>)</span><br />
+      True if the credential is expired or invalid.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2Credentials.access_token_expired">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="oauth2client.client.OAuth2Credentials-class.html#set_store" class="summary-sig-name">set_store</a>(<span class="summary-sig-arg">self</span>,
         <span class="summary-sig-arg">store</span>)</span><br />
       Set the Storage for the credential.</td>
@@ -432,14 +451,6 @@
     </table>
   </td>
 </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired" class="summary-name">access_token_expired</a><br />
-      True if the credential is expired or invalid.
-    </td>
-  </tr>
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
@@ -473,12 +484,19 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">access_token</span>,
+        <span class="sig-arg">client_id</span>,
+        <span class="sig-arg">client_secret</span>,
+        <span class="sig-arg">refresh_token</span>,
+        <span class="sig-arg">token_expiry</span>,
+        <span class="sig-arg">token_uri</span>,
+        <span class="sig-arg">user_agent</span>,
+        <span class="sig-arg">id_token</span>=<span class="sig-default">None</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2Credentials.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -689,6 +707,34 @@
   </dl>
 </td></tr></table>
 </div>
+<a name="access_token_expired"></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">access_token_expired</span>(<span class="sig-arg">self</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2Credentials.access_token_expired">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+True if the credential is expired or invalid.
+
+If the token_expiry isn't set, we assume the token doesn't expire.
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@property</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
 <a name="set_store"></a>
 <div>
 <table class="details" border="1" cellpadding="3"
@@ -784,45 +830,6 @@
 </td></tr></table>
 </div>
 <br />
-<!-- ==================== PROPERTY DETAILS ==================== -->
-<a name="section-PropertyDetails"></a>
-<table class="details" 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">Property Details</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-PropertyDetails"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
-<a name="access_token_expired"></a>
-<div>
-<table class="details" border="1" cellpadding="3"
-       cellspacing="0" width="100%" bgcolor="white">
-<tr><td>
-  <h3 class="epydoc">access_token_expired</h3>
-  <pre class="literalblock">
-True if the credential is expired or invalid.
-
-If the token_expiry isn't set, we assume the token doesn't expire.
-
-</pre>
-  <dl class="fields">
-    <dt>Get Method:</dt>
-    <dd class="value"><span class="summary-sig"><i>unreachable</i>.access_token_expired(<span class="summary-sig-arg">self</span>)</span>
-        - True if the credential is expired or invalid.
-    </dd>
-  </dl>
-</td></tr></table>
-</div>
-<br />
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -846,7 +853,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.OAuth2WebServerFlow-class.html b/docs/epy/oauth2client.client.OAuth2WebServerFlow-class.html
index 0779f42..bfc3b16 100644
--- a/docs/epy/oauth2client.client.OAuth2WebServerFlow-class.html
+++ b/docs/epy/oauth2client.client.OAuth2WebServerFlow-class.html
@@ -56,8 +56,8 @@
 <h1 class="epydoc">Class OAuth2WebServerFlow</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2WebServerFlow">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_oauth2webs" name="class_hierarchy_for_oauth2webs">
-<area shape="rect" href="oauth2client.client.Flow-class.html" title="Flow" alt="" coords="59,5,107,32"/>
-<area shape="rect" href="oauth2client.client.OAuth2WebServerFlow-class.html" title="OAuth2WebServerFlow" alt="" coords="5,61,160,88"/>
+<area shape="rect" href="oauth2client.client.Flow-class.html" title="Flow" alt="" coords="5,5,53,32"/>
+<area shape="rect" href="oauth2client.client.OAuth2WebServerFlow-class.html" title="OAuth2WebServerFlow" alt="" coords="77,5,232,32"/>
 </map>
   <img src="class_hierarchy_for_oauth2webs.gif" alt='' usemap="#class_hierarchy_for_oauth2webs" ismap="ismap" class="graph-without-title" />
 </center>
@@ -93,11 +93,18 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.client.OAuth2WebServerFlow-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">*args</span>,
+          <td><span class="summary-sig"><a href="oauth2client.client.OAuth2WebServerFlow-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">client_id</span>,
+        <span class="summary-sig-arg">client_secret</span>,
+        <span class="summary-sig-arg">scope</span>,
+        <span class="summary-sig-arg">redirect_uri</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">user_agent</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">auth_uri</span>=<span class="summary-sig-default">'https://accounts.google.com/o/oauth2/auth'</span>,
+        <span class="summary-sig-arg">token_uri</span>=<span class="summary-sig-default">'https://accounts.google.com/o/oauth2/token'</span>,
         <span class="summary-sig-arg">**kwargs</span>)</span><br />
       Constructor for OAuth2WebServerFlow.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2WebServerFlow.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -111,11 +118,11 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.client.OAuth2WebServerFlow-class.html#step1_get_authorize_url" class="summary-sig-name">step1_get_authorize_url</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="oauth2client.client.OAuth2WebServerFlow-class.html#step1_get_authorize_url" class="summary-sig-name">step1_get_authorize_url</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">redirect_uri</span>=<span class="summary-sig-default">None</span>)</span><br />
       Returns a URI to redirect to the provider.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2WebServerFlow.step1_get_authorize_url">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -129,11 +136,12 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.client.OAuth2WebServerFlow-class.html#step2_exchange" class="summary-sig-name">step2_exchange</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="oauth2client.client.OAuth2WebServerFlow-class.html#step2_exchange" class="summary-sig-name">step2_exchange</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">code</span>,
+        <span class="summary-sig-arg">http</span>=<span class="summary-sig-default">None</span>)</span><br />
       Exhanges a code for OAuth2Credentials.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2WebServerFlow.step2_exchange">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -210,12 +218,19 @@
 <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">*args</span>,
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">client_id</span>,
+        <span class="sig-arg">client_secret</span>,
+        <span class="sig-arg">scope</span>,
+        <span class="sig-arg">redirect_uri</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">user_agent</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">auth_uri</span>=<span class="sig-default">'https://accounts.google.com/o/oauth2/auth'</span>,
+        <span class="sig-arg">token_uri</span>=<span class="sig-default">'https://accounts.google.com/o/oauth2/token'</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="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2WebServerFlow.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -257,11 +272,11 @@
 <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">step1_get_authorize_url</span>(<span class="sig-arg">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">step1_get_authorize_url</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">redirect_uri</span>=<span class="sig-default">None</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2WebServerFlow.step1_get_authorize_url">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -293,11 +308,12 @@
 <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">step2_exchange</span>(<span class="sig-arg">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">step2_exchange</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">code</span>,
+        <span class="sig-arg">http</span>=<span class="sig-default">None</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#OAuth2WebServerFlow.step2_exchange">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -350,7 +366,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:45 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:14 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.SignedJwtAssertionCredentials-class.html b/docs/epy/oauth2client.client.SignedJwtAssertionCredentials-class.html
index 70c87b0..3e4486f 100644
--- a/docs/epy/oauth2client.client.SignedJwtAssertionCredentials-class.html
+++ b/docs/epy/oauth2client.client.SignedJwtAssertionCredentials-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class SignedJwtAssertionCredentials</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#SignedJwtAssertionCredentials">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_signedjwta" name="class_hierarchy_for_signedjwta">
-<area shape="rect" href="oauth2client.client.AssertionCredentials-class.html" title="AssertionCredentials" alt="" coords="35,117,176,144"/>
-<area shape="rect" href="oauth2client.client.SignedJwtAssertionCredentials-class.html" title="SignedJwtAssertionCredentials" alt="" coords="5,173,205,200"/>
-<area shape="rect" href="oauth2client.client.Credentials-class.html" title="Credentials" alt="" coords="63,5,148,32"/>
-<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="OAuth2Credentials" alt="" coords="40,61,171,88"/>
+<area shape="rect" href="oauth2client.client.AssertionCredentials-class.html" title="AssertionCredentials" alt="" coords="5,5,147,32"/>
+<area shape="rect" href="oauth2client.client.Credentials-class.html" title="Credentials" alt="" coords="171,5,256,32"/>
+<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="OAuth2Credentials" alt="" coords="280,5,411,32"/>
+<area shape="rect" href="oauth2client.client.SignedJwtAssertionCredentials-class.html" title="SignedJwtAssertionCredentials" alt="" coords="435,5,635,32"/>
 </map>
   <img src="class_hierarchy_for_signedjwta.gif" alt='' usemap="#class_hierarchy_for_signedjwta" ismap="ismap" class="graph-without-title" />
 </center>
@@ -101,11 +101,17 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.client.SignedJwtAssertionCredentials-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">*args</span>,
+          <td><span class="summary-sig"><a href="oauth2client.client.SignedJwtAssertionCredentials-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">service_account_name</span>,
+        <span class="summary-sig-arg">private_key</span>,
+        <span class="summary-sig-arg">scope</span>,
+        <span class="summary-sig-arg">private_key_password</span>=<span class="summary-sig-default">'notasecret'</span>,
+        <span class="summary-sig-arg">user_agent</span>=<span class="summary-sig-default">None</span>,
+        <span class="summary-sig-arg">token_uri</span>=<span class="summary-sig-default">'https://accounts.google.com/o/oauth2/token'</span>,
         <span class="summary-sig-arg">**kwargs</span>)</span><br />
       Constructor for SignedJwtAssertionCredentials.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.client-pysrc.html#SignedJwtAssertionCredentials.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -138,6 +144,7 @@
     <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a></code></b>:
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#__getstate__">__getstate__</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#__setstate__">__setstate__</a></code>,
+      <code><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#apply">apply</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#authorize">authorize</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#refresh">refresh</a></code>,
@@ -264,9 +271,6 @@
 </tr>
   <tr>
     <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.client.OAuth2Credentials-class.html">OAuth2Credentials</a></code></b>:
-      <code><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a></code>
-      </p>
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
       <code>__class__</code>
       </p>
@@ -298,12 +302,18 @@
 <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">*args</span>,
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">service_account_name</span>,
+        <span class="sig-arg">private_key</span>,
+        <span class="sig-arg">scope</span>,
+        <span class="sig-arg">private_key_password</span>=<span class="sig-default">'notasecret'</span>,
+        <span class="sig-arg">user_agent</span>=<span class="sig-default">None</span>,
+        <span class="sig-arg">token_uri</span>=<span class="sig-default">'https://accounts.google.com/o/oauth2/token'</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="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.client-pysrc.html#SignedJwtAssertionCredentials.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -418,7 +428,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.Storage-class.html b/docs/epy/oauth2client.client.Storage-class.html
index b1129d0..93314f7 100644
--- a/docs/epy/oauth2client.client.Storage-class.html
+++ b/docs/epy/oauth2client.client.Storage-class.html
@@ -55,25 +55,11 @@
 <!-- ==================== CLASS DESCRIPTION ==================== -->
 <h1 class="epydoc">Class Storage</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#Storage">source&nbsp;code</a></span></p>
 <center>
-  <div class="private"><center>  <map id="class_hierarchy_for_storage" name="class_hierarchy_for_storage">
-<area shape="rect" href="oauth2client.appengine.StorageByKeyName-class.html" title="appengine.StorageByKeyName" alt="" coords="5,61,208,88"/>
-<area shape="rect" href="oauth2client.client.Storage-class.html" title="Storage" alt="" coords="401,5,468,32"/>
-<area shape="rect" href="oauth2client.django_orm.Storage-class.html" title="django_orm.Storage" alt="" coords="232,61,368,88"/>
-<area shape="rect" href="oauth2client.file.Storage-class.html" title="file.Storage" alt="" coords="392,61,477,88"/>
-<area shape="rect" href="oauth2client.keyring_storage.Storage-class.html" title="keyring_storage.Storage" alt="" coords="501,61,664,88"/>
-<area shape="rect" href="oauth2client.multistore_file._MultiStore._Storage-class.html" title="multistore_file._MultiStore._Storage" alt="" coords="688,61,915,88"/>
+<center>  <map id="class_hierarchy_for_storage" name="class_hierarchy_for_storage">
+<area shape="rect" href="oauth2client.client.Storage-class.html" title="Storage" alt="" coords="5,5,72,32"/>
 </map>
   <img src="class_hierarchy_for_storage.gif" alt='' usemap="#class_hierarchy_for_storage" ismap="ismap" class="graph-without-title" />
-</center></div>
-  <div class="public" style="display:none"><center>  <map id="class_hierarchy_for_storage_2" name="class_hierarchy_for_storage_2">
-<area shape="rect" href="oauth2client.appengine.StorageByKeyName-class.html" title="appengine.StorageByKeyName" alt="" coords="5,61,208,88"/>
-<area shape="rect" href="oauth2client.client.Storage-class.html" title="Storage" alt="" coords="333,5,400,32"/>
-<area shape="rect" href="oauth2client.django_orm.Storage-class.html" title="django_orm.Storage" alt="" coords="232,61,368,88"/>
-<area shape="rect" href="oauth2client.file.Storage-class.html" title="file.Storage" alt="" coords="392,61,477,88"/>
-<area shape="rect" href="oauth2client.keyring_storage.Storage-class.html" title="keyring_storage.Storage" alt="" coords="501,61,664,88"/>
-</map>
-  <img src="class_hierarchy_for_storage_2.gif" alt='' usemap="#class_hierarchy_for_storage_2" ismap="ismap" class="graph-without-title" />
-</center></div>
+</center>
 </center>
 <hr />
 <pre class="literalblock">
@@ -538,7 +524,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.UnknownClientSecretsFlowError-class.html b/docs/epy/oauth2client.client.UnknownClientSecretsFlowError-class.html
index fa21052..bd78198 100644
--- a/docs/epy/oauth2client.client.UnknownClientSecretsFlowError-class.html
+++ b/docs/epy/oauth2client.client.UnknownClientSecretsFlowError-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class UnknownClientSecretsFlowError</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.client-pysrc.html#UnknownClientSecretsFlowError">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_unknowncli" name="class_hierarchy_for_unknowncli">
-<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="21,5,197,32"/>
-<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="36,61,183,88"/>
-<area shape="rect" href="oauth2client.client.Error-class.html" title="Error" alt="" coords="85,117,133,144"/>
-<area shape="rect" href="oauth2client.client.UnknownClientSecretsFlowError-class.html" title="UnknownClientSecretsFlowError" alt="" coords="5,173,213,200"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
+<area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
+<area shape="rect" href="oauth2client.client.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
+<area shape="rect" href="oauth2client.client.UnknownClientSecretsFlowError-class.html" title="UnknownClientSecretsFlowError" alt="" coords="205,5,413,32"/>
 </map>
   <img src="class_hierarchy_for_unknowncli.gif" alt='' usemap="#class_hierarchy_for_unknowncli" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.client.VerifyJwtTokenError-class.html b/docs/epy/oauth2client.client.VerifyJwtTokenError-class.html
index 0b65c55..d1fa637 100644
--- a/docs/epy/oauth2client.client.VerifyJwtTokenError-class.html
+++ b/docs/epy/oauth2client.client.VerifyJwtTokenError-class.html
@@ -59,7 +59,7 @@
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 <area shape="rect" href="oauth2client.client.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="oauth2client.client.VerifyJwtTokenError-class.html" title="VerifyJwtTokenError" alt="" coords="25,173,161,200"/>
+<area shape="rect" href="oauth2client.client.VerifyJwtTokenError-class.html" title="VerifyJwtTokenError" alt="" coords="205,5,341,32"/>
 </map>
   <img src="class_hierarchy_for_verifyjwtt.gif" alt='' usemap="#class_hierarchy_for_verifyjwtt" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.clientsecrets-module.html b/docs/epy/oauth2client.clientsecrets-module.html
index 1b6c47c..40d5496 100644
--- a/docs/epy/oauth2client.clientsecrets-module.html
+++ b/docs/epy/oauth2client.clientsecrets-module.html
@@ -220,36 +220,25 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="TYPE_WEB"></a><span class="summary-name">TYPE_WEB</span> = <code title="'web'"><code class="variable-quote">'</code><code class="variable-string">web</code><code class="variable-quote">'</code></code>
+        <a name="TYPE_WEB"></a><span class="summary-name">TYPE_WEB</span> = <code title="'web'">'web'</code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="TYPE_INSTALLED"></a><span class="summary-name">TYPE_INSTALLED</span> = <code title="'installed'"><code class="variable-quote">'</code><code class="variable-string">installed</code><code class="variable-quote">'</code></code>
+        <a name="TYPE_INSTALLED"></a><span class="summary-name">TYPE_INSTALLED</span> = <code title="'installed'">'installed'</code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a href="oauth2client.clientsecrets-module.html#VALID_CLIENT" class="summary-name">VALID_CLIENT</a> = <code title="{'installed': {'required': ['client_id',
-                            'client_secret',
-                            'redirect_uris',
-                            'auth_uri',
-                            'token_uri'],
-               'string': ['client_id', 'client_secret']},
- 'web': {'required': ['client_id',
-                      'client_secret',
-..."><code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">installed</code><code class="variable-quote">'</code><code class="variable-op">: </code><code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">required</code><code class="variable-quote">'</code><code class="variable-op">: </code><code class="variable-group">[</code><code class="variable-quote">'</code><code class="variable-string">client_id</code><code class="variable-quote">'</code><code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">clien</code><code class="variable-ellipsis">...</code></code>
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
+        <a href="oauth2client.clientsecrets-module.html#VALID_CLIENT" class="summary-name">VALID_CLIENT</a> = <code title="{TYPE_WEB: {'required': ['client_id', 'client_secret', 'redirect_uris'\
+, 'auth_uri', 'token_uri'], 'string': ['client_id', 'client_secret']},\
+ TYPE_INSTALLED: {'required': ['client_id', 'client_secret', 'redirect\
+_uris', 'auth_uri', 'token_uri'], 'string': ['client_id', 'client_secr\
+et']}}">{TYPE_WEB: {'required': ['client_id', 'client_s<code class="variable-ellipsis">...</code></code>
     </td>
   </tr>
 </table>
@@ -353,15 +342,11 @@
   <dl class="fields">
     <dt>Value:</dt>
       <dd><table><tr><td><pre class="variable">
-<code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">installed</code><code class="variable-quote">'</code><code class="variable-op">: </code><code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">required</code><code class="variable-quote">'</code><code class="variable-op">: </code><code class="variable-group">[</code><code class="variable-quote">'</code><code class="variable-string">client_id</code><code class="variable-quote">'</code><code class="variable-op">,</code>
-                            <code class="variable-quote">'</code><code class="variable-string">client_secret</code><code class="variable-quote">'</code><code class="variable-op">,</code>
-                            <code class="variable-quote">'</code><code class="variable-string">redirect_uris</code><code class="variable-quote">'</code><code class="variable-op">,</code>
-                            <code class="variable-quote">'</code><code class="variable-string">auth_uri</code><code class="variable-quote">'</code><code class="variable-op">,</code>
-                            <code class="variable-quote">'</code><code class="variable-string">token_uri</code><code class="variable-quote">'</code><code class="variable-group">]</code><code class="variable-op">,</code>
-               <code class="variable-quote">'</code><code class="variable-string">string</code><code class="variable-quote">'</code><code class="variable-op">: </code><code class="variable-group">[</code><code class="variable-quote">'</code><code class="variable-string">client_id</code><code class="variable-quote">'</code><code class="variable-op">, </code><code class="variable-quote">'</code><code class="variable-string">client_secret</code><code class="variable-quote">'</code><code class="variable-group">]</code><code class="variable-group">}</code><code class="variable-op">,</code>
- <code class="variable-quote">'</code><code class="variable-string">web</code><code class="variable-quote">'</code><code class="variable-op">: </code><code class="variable-group">{</code><code class="variable-quote">'</code><code class="variable-string">required</code><code class="variable-quote">'</code><code class="variable-op">: </code><code class="variable-group">[</code><code class="variable-quote">'</code><code class="variable-string">client_id</code><code class="variable-quote">'</code><code class="variable-op">,</code>
-                      <code class="variable-quote">'</code><code class="variable-string">client_secret</code><code class="variable-quote">'</code><code class="variable-op">,</code>
-<code class="variable-ellipsis">...</code>
+{TYPE_WEB: {'required': ['client_id', 'client_secret', 'redirect_uris'<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+, 'auth_uri', 'token_uri'], 'string': ['client_id', 'client_secret']},<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+ TYPE_INSTALLED: {'required': ['client_id', 'client_secret', 'redirect<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+_uris', 'auth_uri', 'token_uri'], 'string': ['client_id', 'client_secr<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+et']}}
 </pre></td></tr></table>
 </dd>
   </dl>
@@ -391,7 +376,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.clientsecrets-pysrc.html b/docs/epy/oauth2client.clientsecrets-pysrc.html
index 426099d..15867c3 100644
--- a/docs/epy/oauth2client.clientsecrets-pysrc.html
+++ b/docs/epy/oauth2client.clientsecrets-pysrc.html
@@ -246,7 +246,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.clientsecrets.Error-class.html b/docs/epy/oauth2client.clientsecrets.Error-class.html
index fdabc4d..94f3cda 100644
--- a/docs/epy/oauth2client.clientsecrets.Error-class.html
+++ b/docs/epy/oauth2client.clientsecrets.Error-class.html
@@ -59,7 +59,6 @@
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 <area shape="rect" href="oauth2client.clientsecrets.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="oauth2client.clientsecrets.InvalidClientSecretsError-class.html" title="InvalidClientSecretsError" alt="" coords="12,173,175,200"/>
 </map>
   <img src="class_hierarchy_for_error_3.gif" alt='' usemap="#class_hierarchy_for_error_3" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +166,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.clientsecrets.InvalidClientSecretsError-class.html b/docs/epy/oauth2client.clientsecrets.InvalidClientSecretsError-class.html
index 3205922..6b3429f 100644
--- a/docs/epy/oauth2client.clientsecrets.InvalidClientSecretsError-class.html
+++ b/docs/epy/oauth2client.clientsecrets.InvalidClientSecretsError-class.html
@@ -59,7 +59,7 @@
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 <area shape="rect" href="oauth2client.clientsecrets.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="oauth2client.clientsecrets.InvalidClientSecretsError-class.html" title="InvalidClientSecretsError" alt="" coords="12,173,175,200"/>
+<area shape="rect" href="oauth2client.clientsecrets.InvalidClientSecretsError-class.html" title="InvalidClientSecretsError" alt="" coords="205,5,368,32"/>
 </map>
   <img src="class_hierarchy_for_invalidcli_2.gif" alt='' usemap="#class_hierarchy_for_invalidcli_2" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.crypt-module.html b/docs/epy/oauth2client.crypt-module.html
index da83ffc..fad29aa 100644
--- a/docs/epy/oauth2client.crypt-module.html
+++ b/docs/epy/oauth2client.crypt-module.html
@@ -242,13 +242,6 @@
         <a name="MAX_TOKEN_LIFETIME_SECS"></a><span class="summary-name">MAX_TOKEN_LIFETIME_SECS</span> = <code title="86400">86400</code>
     </td>
   </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
 </table>
 <!-- ==================== FUNCTION DETAILS ==================== -->
 <a name="section-FunctionDetails"></a>
@@ -362,7 +355,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.crypt-pysrc.html b/docs/epy/oauth2client.crypt-pysrc.html
index 4a3a6eb..a694f57 100644
--- a/docs/epy/oauth2client.crypt-pysrc.html
+++ b/docs/epy/oauth2client.crypt-pysrc.html
@@ -354,7 +354,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.crypt.AppIdentityError-class.html b/docs/epy/oauth2client.crypt.AppIdentityError-class.html
index bf5ded8..5878595 100644
--- a/docs/epy/oauth2client.crypt.AppIdentityError-class.html
+++ b/docs/epy/oauth2client.crypt.AppIdentityError-class.html
@@ -161,7 +161,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.crypt.Signer-class.html b/docs/epy/oauth2client.crypt.Signer-class.html
index 41a64e9..4756625 100644
--- a/docs/epy/oauth2client.crypt.Signer-class.html
+++ b/docs/epy/oauth2client.crypt.Signer-class.html
@@ -163,7 +163,7 @@
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
           <td><span class="summary-sig"><a href="oauth2client.crypt.Signer-class.html#from_string" class="summary-sig-name">from_string</a>(<span class="summary-sig-arg">key</span>,
-        <span class="summary-sig-arg">password</span>=<span class="summary-sig-default"><code class="variable-quote">'</code><code class="variable-string">notasecret</code><code class="variable-quote">'</code></span>)</span><br />
+        <span class="summary-sig-arg">password</span>=<span class="summary-sig-default">'notasecret'</span>)</span><br />
       Construct a Signer instance from a string.</td>
           <td align="right" valign="top">
             <span class="codelink"><a href="oauth2client.crypt-pysrc.html#Signer.from_string">source&nbsp;code</a></span>
@@ -285,7 +285,7 @@
   <table width="100%" cellpadding="0" cellspacing="0" border="0">
   <tr valign="top"><td>
   <h3 class="epydoc"><span class="sig"><span class="sig-name">from_string</span>(<span class="sig-arg">key</span>,
-        <span class="sig-arg">password</span>=<span class="sig-default"><code class="variable-quote">'</code><code class="variable-string">notasecret</code><code class="variable-quote">'</code></span>)</span>
+        <span class="sig-arg">password</span>=<span class="sig-default">'notasecret'</span>)</span>
     <br /><em class="fname">Static Method</em>
   </h3>
   </td><td align="right" valign="top"
@@ -335,7 +335,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.crypt.Verifier-class.html b/docs/epy/oauth2client.crypt.Verifier-class.html
index 97d0189..2447234 100644
--- a/docs/epy/oauth2client.crypt.Verifier-class.html
+++ b/docs/epy/oauth2client.crypt.Verifier-class.html
@@ -340,7 +340,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.django_orm-module.html b/docs/epy/oauth2client.django_orm-module.html
index 30bb147..69b1bf7 100644
--- a/docs/epy/oauth2client.django_orm-module.html
+++ b/docs/epy/oauth2client.django_orm-module.html
@@ -106,31 +106,6 @@
     </td>
   </tr>
 </table>
-<!-- ==================== VARIABLES ==================== -->
-<a name="section-Variables"></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">Variables</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Variables"
-         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">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
-</table>
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -154,7 +129,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.django_orm-pysrc.html b/docs/epy/oauth2client.django_orm-pysrc.html
index 2a7f8ca..da58abe 100644
--- a/docs/epy/oauth2client.django_orm-pysrc.html
+++ b/docs/epy/oauth2client.django_orm-pysrc.html
@@ -87,7 +87,8 @@
 <a name="L29"></a><tt class="py-lineno"> 29</tt>  <tt class="py-line"> </tt>
 <a name="CredentialsField"></a><div id="CredentialsField-def"><a name="L30"></a><tt class="py-lineno"> 30</tt> <a class="py-toggle" href="#" id="CredentialsField-toggle" onclick="return toggle('CredentialsField');">-</a><tt class="py-line"><tt class="py-keyword">class</tt> <a class="py-def-name" href="oauth2client.django_orm.CredentialsField-class.html">CredentialsField</a><tt class="py-op">(</tt><tt class="py-base-class">models</tt><tt class="py-op">.</tt><tt class="py-base-class">Field</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="CredentialsField-collapsed" style="display:none;" pad="+++" indent="++++"></div><div id="CredentialsField-expanded"><a name="L31"></a><tt class="py-lineno"> 31</tt>  <tt class="py-line"> </tt>
-<a name="L32"></a><tt class="py-lineno"> 32</tt>  <tt class="py-line">  <tt class="py-name">__metaclass__</tt> <tt class="py-op">=</tt> <tt class="py-name">models</tt><tt class="py-op">.</tt><tt id="link-4" class="py-name" targets="Class django.db.models.fields.subclassing.SubfieldBase=django.db.models.fields.subclassing.SubfieldBase-class.html"><a title="django.db.models.fields.subclassing.SubfieldBase" class="py-name" href="#" onclick="return doclink('link-4', 'SubfieldBase', 'link-4');">SubfieldBase</a></tt> </tt>
+<a name="L32"></a><tt class="py-lineno"> 32</tt>  <tt class="py-line">  <tt id="link-4" class="py-name" targets="Variable oauth2client.django_orm.CredentialsField.__metaclass__=oauth2client.django_orm.CredentialsField-class.html#__metaclass__,Variable oauth2client.django_orm.FlowField.__metaclass__=oauth2client.django_orm.FlowField-class.html#__metaclass__"><a title="oauth2client.django_orm.CredentialsField.__metaclass__
+oauth2client.django_orm.FlowField.__metaclass__" class="py-name" href="#" onclick="return doclink('link-4', '__metaclass__', 'link-4');">__metaclass__</a></tt> <tt class="py-op">=</tt> <tt class="py-name">models</tt><tt class="py-op">.</tt><tt class="py-name">SubfieldBase</tt> </tt>
 <a name="L33"></a><tt class="py-lineno"> 33</tt>  <tt class="py-line"> </tt>
 <a name="CredentialsField.__init__"></a><div id="CredentialsField.__init__-def"><a name="L34"></a><tt class="py-lineno"> 34</tt> <a class="py-toggle" href="#" id="CredentialsField.__init__-toggle" onclick="return toggle('CredentialsField.__init__');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.django_orm.CredentialsField-class.html#__init__">__init__</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-op">*</tt><tt class="py-param">args</tt><tt class="py-op">,</tt> <tt class="py-op">**</tt><tt class="py-param">kwargs</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="CredentialsField.__init__-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="CredentialsField.__init__-expanded"><a name="L35"></a><tt class="py-lineno"> 35</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-string">'null'</tt> <tt class="py-keyword">not</tt> <tt class="py-keyword">in</tt> <tt class="py-name">kwargs</tt><tt class="py-op">:</tt> </tt>
@@ -154,7 +155,8 @@
 <a name="L54"></a><tt class="py-lineno"> 54</tt>  <tt class="py-line"> </tt>
 <a name="FlowField"></a><div id="FlowField-def"><a name="L55"></a><tt class="py-lineno"> 55</tt> <a class="py-toggle" href="#" id="FlowField-toggle" onclick="return toggle('FlowField');">-</a><tt class="py-line"><tt class="py-keyword">class</tt> <a class="py-def-name" href="oauth2client.django_orm.FlowField-class.html">FlowField</a><tt class="py-op">(</tt><tt class="py-base-class">models</tt><tt class="py-op">.</tt><tt class="py-base-class">Field</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="FlowField-collapsed" style="display:none;" pad="+++" indent="++++"></div><div id="FlowField-expanded"><a name="L56"></a><tt class="py-lineno"> 56</tt>  <tt class="py-line"> </tt>
-<a name="L57"></a><tt class="py-lineno"> 57</tt>  <tt class="py-line">  <tt class="py-name">__metaclass__</tt> <tt class="py-op">=</tt> <tt class="py-name">models</tt><tt class="py-op">.</tt><tt id="link-11" class="py-name"><a title="django.db.models.fields.subclassing.SubfieldBase" class="py-name" href="#" onclick="return doclink('link-11', 'SubfieldBase', 'link-4');">SubfieldBase</a></tt> </tt>
+<a name="L57"></a><tt class="py-lineno"> 57</tt>  <tt class="py-line">  <tt id="link-11" class="py-name"><a title="oauth2client.django_orm.CredentialsField.__metaclass__
+oauth2client.django_orm.FlowField.__metaclass__" class="py-name" href="#" onclick="return doclink('link-11', '__metaclass__', 'link-4');">__metaclass__</a></tt> <tt class="py-op">=</tt> <tt class="py-name">models</tt><tt class="py-op">.</tt><tt class="py-name">SubfieldBase</tt> </tt>
 <a name="L58"></a><tt class="py-lineno"> 58</tt>  <tt class="py-line"> </tt>
 <a name="FlowField.__init__"></a><div id="FlowField.__init__-def"><a name="L59"></a><tt class="py-lineno"> 59</tt> <a class="py-toggle" href="#" id="FlowField.__init__-toggle" onclick="return toggle('FlowField.__init__');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.django_orm.FlowField-class.html#__init__">__init__</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">,</tt> <tt class="py-op">*</tt><tt class="py-param">args</tt><tt class="py-op">,</tt> <tt class="py-op">**</tt><tt class="py-param">kwargs</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="FlowField.__init__-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="FlowField.__init__-expanded"><a name="L60"></a><tt class="py-lineno"> 60</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-string">'null'</tt> <tt class="py-keyword">not</tt> <tt class="py-keyword">in</tt> <tt class="py-name">kwargs</tt><tt class="py-op">:</tt> </tt>
@@ -305,7 +307,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.django_orm.CredentialsField-class.html b/docs/epy/oauth2client.django_orm.CredentialsField-class.html
index 417280f..1765fba 100644
--- a/docs/epy/oauth2client.django_orm.CredentialsField-class.html
+++ b/docs/epy/oauth2client.django_orm.CredentialsField-class.html
@@ -56,39 +56,13 @@
 <h1 class="epydoc">Class CredentialsField</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.django_orm-pysrc.html#CredentialsField">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_credential_4" name="class_hierarchy_for_credential_4">
-<area shape="rect" href="javascript:void(0);" title="django.db.models.fields.Field" alt="" coords="5,5,195,32"/>
-<area shape="rect" href="oauth2client.django_orm.CredentialsField-class.html" title="CredentialsField" alt="" coords="43,61,157,88"/>
+<area shape="rect" href="javascript:void(0);" title="django.db.models.Field" alt="" coords="5,5,160,32"/>
+<area shape="rect" href="oauth2client.django_orm.CredentialsField-class.html" title="CredentialsField" alt="" coords="184,5,299,32"/>
 </map>
   <img src="class_hierarchy_for_credential_4.gif" alt='' usemap="#class_hierarchy_for_credential_4" ismap="ismap" class="graph-without-title" />
 </center>
 </center>
 <hr />
-<!-- ==================== NESTED CLASSES ==================== -->
-<a name="section-NestedClasses"></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">Nested Classes</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-NestedClasses"
-         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">
-        <a href="django.db.models.fields.subclassing.SubfieldBase-class.html" class="summary-name">__metaclass__</a><br />
-      A metaclass for custom Field subclasses.
-    </td>
-  </tr>
-</table>
 <!-- ==================== INSTANCE METHODS ==================== -->
 <a name="section-InstanceMethods"></a>
 <table class="summary" border="1" cellpadding="3"
@@ -112,10 +86,9 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.django_orm.CredentialsField-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+          <td><span class="summary-sig"><a name="__init__"></a><span class="summary-sig-name">__init__</span>(<span class="summary-sig-arg">self</span>,
         <span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
-      x.__init__(...) initializes x; see x.__class__.__doc__ for signature</td>
+        <span class="summary-sig-arg">**kwargs</span>)</span></td>
           <td align="right" valign="top">
             <span class="codelink"><a href="oauth2client.django_orm-pysrc.html#CredentialsField.__init__">source&nbsp;code</a></span>
             
@@ -131,7 +104,7 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.django_orm.CredentialsField-class.html#get_internal_type" class="summary-sig-name">get_internal_type</a>(<span class="summary-sig-arg">self</span>)</span></td>
+          <td><span class="summary-sig"><a name="get_internal_type"></a><span class="summary-sig-name">get_internal_type</span>(<span class="summary-sig-arg">self</span>)</span></td>
           <td align="right" valign="top">
             <span class="codelink"><a href="oauth2client.django_orm-pysrc.html#CredentialsField.get_internal_type">source&nbsp;code</a></span>
             
@@ -147,10 +120,8 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.django_orm.CredentialsField-class.html#to_python" class="summary-sig-name">to_python</a>(<span class="summary-sig-arg">self</span>,
-        <span class="summary-sig-arg">value</span>)</span><br />
-      Converts the input value into the expected Python data type, raising
-django.core.exceptions.ValidationError if the data can't be converted.</td>
+          <td><span class="summary-sig"><a name="to_python"></a><span class="summary-sig-name">to_python</span>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">value</span>)</span></td>
           <td align="right" valign="top">
             <span class="codelink"><a href="oauth2client.django_orm-pysrc.html#CredentialsField.to_python">source&nbsp;code</a></span>
             
@@ -166,12 +137,10 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.django_orm.CredentialsField-class.html#get_db_prep_value" class="summary-sig-name">get_db_prep_value</a>(<span class="summary-sig-arg">self</span>,
+          <td><span class="summary-sig"><a name="get_db_prep_value"></a><span class="summary-sig-name">get_db_prep_value</span>(<span class="summary-sig-arg">self</span>,
         <span class="summary-sig-arg">value</span>,
         <span class="summary-sig-arg">connection</span>,
-        <span class="summary-sig-arg">prepared</span>=<span class="summary-sig-default">False</span>)</span><br />
-      Returns field's value prepared for interacting with the database
-backend.</td>
+        <span class="summary-sig-arg">prepared</span>=<span class="summary-sig-default">False</span>)</span></td>
           <td align="right" valign="top">
             <span class="codelink"><a href="oauth2client.django_orm-pysrc.html#CredentialsField.get_db_prep_value">source&nbsp;code</a></span>
             
@@ -181,76 +150,6 @@
       
     </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="oauth2client.django_orm.CredentialsField-class.html#contribute_to_class" class="summary-sig-name">contribute_to_class</a>(<span class="summary-sig-arg">self</span>,
-        <span class="summary-sig-arg">cls</span>,
-        <span class="summary-sig-arg">name</span>)</span></td>
-          <td align="right" valign="top">
-            
-            
-          </td>
-        </tr>
-      </table>
-      
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code>django.db.models.fields.Field</code></b>:
-      <code>__cmp__</code>,
-      <code>__deepcopy__</code>,
-      <code>__repr__</code>,
-      <code>bind</code>,
-      <code>clean</code>,
-      <code>db_type</code>,
-      <code>formfield</code>,
-      <code>get_attname</code>,
-      <code>get_attname_column</code>,
-      <code>get_cache_name</code>,
-      <code>get_choices</code>,
-      <code>get_choices_default</code>,
-      <code>get_db_prep_lookup</code>,
-      <code>get_db_prep_save</code>,
-      <code>get_default</code>,
-      <code>get_flatchoices</code>,
-      <code>get_prep_lookup</code>,
-      <code>get_prep_value</code>,
-      <code>get_validator_unique_lookup_type</code>,
-      <code>has_default</code>,
-      <code>pre_save</code>,
-      <code>run_validators</code>,
-      <code>save_form_data</code>,
-      <code>set_attributes_from_name</code>,
-      <code>validate</code>,
-      <code>value_from_object</code>,
-      <code>value_to_string</code>
-      </p>
-    <div class="private">    <p class="indent-wrapped-lines"><b>Inherited from <code>django.db.models.fields.Field</code></b> (private):
-      <code>_description</code>,
-      <code>_get_choices</code>,
-      <code>_get_flatchoices</code>,
-      <code>_get_val_from_obj</code>
-      </p></div>
-    <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
-      <code>__delattr__</code>,
-      <code>__format__</code>,
-      <code>__getattribute__</code>,
-      <code>__hash__</code>,
-      <code>__new__</code>,
-      <code>__reduce__</code>,
-      <code>__reduce_ex__</code>,
-      <code>__setattr__</code>,
-      <code>__sizeof__</code>,
-      <code>__str__</code>,
-      <code>__subclasshook__</code>
-      </p>
-    </td>
-  </tr>
 </table>
 <!-- ==================== CLASS VARIABLES ==================== -->
 <a name="section-ClassVariables"></a>
@@ -269,206 +168,14 @@
     </table>
   </td>
 </tr>
-  <tr>
-    <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code>django.db.models.fields.Field</code></b>:
-      <code>auto_creation_counter</code>,
-      <code>creation_counter</code>,
-      <code>default_error_messages</code>,
-      <code>default_validators</code>,
-      <code>empty_strings_allowed</code>
-      </p>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="__metaclass__"></a><span class="summary-name">__metaclass__</span> = <code title="models.SubfieldBase">models.SubfieldBase</code>
     </td>
   </tr>
 </table>
-<!-- ==================== PROPERTIES ==================== -->
-<a name="section-Properties"></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">Properties</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Properties"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-  <tr>
-    <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code>django.db.models.fields.Field</code></b>:
-      <code>choices</code>,
-      <code>description</code>,
-      <code>flatchoices</code>,
-      <code>unique</code>
-      </p>
-    <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
-      <code>__class__</code>
-      </p>
-    </td>
-  </tr>
-</table>
-<!-- ==================== METHOD DETAILS ==================== -->
-<a name="section-MethodDetails"></a>
-<table class="details" 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">Method Details</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-MethodDetails"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
-<a name="__init__"></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">__init__</span>(<span class="sig-arg">self</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="oauth2client.django_orm-pysrc.html#CredentialsField.__init__">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-x.__init__(...) initializes x; see x.__class__.__doc__ for signature
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        object.__init__
-        <dd><em class="note">(inherited documentation)</em></dd>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="get_internal_type"></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">get_internal_type</span>(<span class="sig-arg">self</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.django_orm-pysrc.html#CredentialsField.get_internal_type">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  
-  <dl class="fields">
-    <dt>Overrides:
-        django.db.models.fields.Field.get_internal_type
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="to_python"></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_python</span>(<span class="sig-arg">self</span>,
-        <span class="sig-arg">value</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.django_orm-pysrc.html#CredentialsField.to_python">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-
-Converts the input value into the expected Python data type, raising
-django.core.exceptions.ValidationError if the data can't be converted.
-Returns the converted value. Subclasses should override this.
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        django.db.models.fields.Field.to_python
-        <dd><em class="note">(inherited documentation)</em></dd>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="get_db_prep_value"></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">get_db_prep_value</span>(<span class="sig-arg">self</span>,
-        <span class="sig-arg">value</span>,
-        <span class="sig-arg">connection</span>,
-        <span class="sig-arg">prepared</span>=<span class="sig-default">False</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.django_orm-pysrc.html#CredentialsField.get_db_prep_value">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-Returns field's value prepared for interacting with the database
-backend.
-
-Used by the default implementations of ``get_db_prep_save``and
-`get_db_prep_lookup```
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        django.db.models.fields.Field.get_db_prep_value
-        <dd><em class="note">(inherited documentation)</em></dd>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="contribute_to_class"></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">contribute_to_class</span>(<span class="sig-arg">self</span>,
-        <span class="sig-arg">cls</span>,
-        <span class="sig-arg">name</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    >&nbsp;
-    </td>
-  </tr></table>
-  
-  
-  <dl class="fields">
-    <dt>Overrides:
-        django.db.models.fields.Field.contribute_to_class
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<br />
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -492,7 +199,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.django_orm.FlowField-class.html b/docs/epy/oauth2client.django_orm.FlowField-class.html
index 9d9d3f1..74bbd22 100644
--- a/docs/epy/oauth2client.django_orm.FlowField-class.html
+++ b/docs/epy/oauth2client.django_orm.FlowField-class.html
@@ -56,39 +56,13 @@
 <h1 class="epydoc">Class FlowField</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.django_orm-pysrc.html#FlowField">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_flowfield" name="class_hierarchy_for_flowfield">
-<area shape="rect" href="javascript:void(0);" title="django.db.models.fields.Field" alt="" coords="5,5,195,32"/>
-<area shape="rect" href="oauth2client.django_orm.FlowField-class.html" title="FlowField" alt="" coords="63,61,137,88"/>
+<area shape="rect" href="javascript:void(0);" title="django.db.models.Field" alt="" coords="5,5,160,32"/>
+<area shape="rect" href="oauth2client.django_orm.FlowField-class.html" title="FlowField" alt="" coords="184,5,259,32"/>
 </map>
   <img src="class_hierarchy_for_flowfield.gif" alt='' usemap="#class_hierarchy_for_flowfield" ismap="ismap" class="graph-without-title" />
 </center>
 </center>
 <hr />
-<!-- ==================== NESTED CLASSES ==================== -->
-<a name="section-NestedClasses"></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">Nested Classes</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-NestedClasses"
-         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">
-        <a href="django.db.models.fields.subclassing.SubfieldBase-class.html" class="summary-name">__metaclass__</a><br />
-      A metaclass for custom Field subclasses.
-    </td>
-  </tr>
-</table>
 <!-- ==================== INSTANCE METHODS ==================== -->
 <a name="section-InstanceMethods"></a>
 <table class="summary" border="1" cellpadding="3"
@@ -112,10 +86,9 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.django_orm.FlowField-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+          <td><span class="summary-sig"><a name="__init__"></a><span class="summary-sig-name">__init__</span>(<span class="summary-sig-arg">self</span>,
         <span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
-      x.__init__(...) initializes x; see x.__class__.__doc__ for signature</td>
+        <span class="summary-sig-arg">**kwargs</span>)</span></td>
           <td align="right" valign="top">
             <span class="codelink"><a href="oauth2client.django_orm-pysrc.html#FlowField.__init__">source&nbsp;code</a></span>
             
@@ -131,7 +104,7 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.django_orm.FlowField-class.html#get_internal_type" class="summary-sig-name">get_internal_type</a>(<span class="summary-sig-arg">self</span>)</span></td>
+          <td><span class="summary-sig"><a name="get_internal_type"></a><span class="summary-sig-name">get_internal_type</span>(<span class="summary-sig-arg">self</span>)</span></td>
           <td align="right" valign="top">
             <span class="codelink"><a href="oauth2client.django_orm-pysrc.html#FlowField.get_internal_type">source&nbsp;code</a></span>
             
@@ -147,10 +120,8 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.django_orm.FlowField-class.html#to_python" class="summary-sig-name">to_python</a>(<span class="summary-sig-arg">self</span>,
-        <span class="summary-sig-arg">value</span>)</span><br />
-      Converts the input value into the expected Python data type, raising
-django.core.exceptions.ValidationError if the data can't be converted.</td>
+          <td><span class="summary-sig"><a name="to_python"></a><span class="summary-sig-name">to_python</span>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">value</span>)</span></td>
           <td align="right" valign="top">
             <span class="codelink"><a href="oauth2client.django_orm-pysrc.html#FlowField.to_python">source&nbsp;code</a></span>
             
@@ -166,12 +137,10 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.django_orm.FlowField-class.html#get_db_prep_value" class="summary-sig-name">get_db_prep_value</a>(<span class="summary-sig-arg">self</span>,
+          <td><span class="summary-sig"><a name="get_db_prep_value"></a><span class="summary-sig-name">get_db_prep_value</span>(<span class="summary-sig-arg">self</span>,
         <span class="summary-sig-arg">value</span>,
         <span class="summary-sig-arg">connection</span>,
-        <span class="summary-sig-arg">prepared</span>=<span class="summary-sig-default">False</span>)</span><br />
-      Returns field's value prepared for interacting with the database
-backend.</td>
+        <span class="summary-sig-arg">prepared</span>=<span class="summary-sig-default">False</span>)</span></td>
           <td align="right" valign="top">
             <span class="codelink"><a href="oauth2client.django_orm-pysrc.html#FlowField.get_db_prep_value">source&nbsp;code</a></span>
             
@@ -181,76 +150,6 @@
       
     </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="oauth2client.django_orm.FlowField-class.html#contribute_to_class" class="summary-sig-name">contribute_to_class</a>(<span class="summary-sig-arg">self</span>,
-        <span class="summary-sig-arg">cls</span>,
-        <span class="summary-sig-arg">name</span>)</span></td>
-          <td align="right" valign="top">
-            
-            
-          </td>
-        </tr>
-      </table>
-      
-    </td>
-  </tr>
-  <tr>
-    <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code>django.db.models.fields.Field</code></b>:
-      <code>__cmp__</code>,
-      <code>__deepcopy__</code>,
-      <code>__repr__</code>,
-      <code>bind</code>,
-      <code>clean</code>,
-      <code>db_type</code>,
-      <code>formfield</code>,
-      <code>get_attname</code>,
-      <code>get_attname_column</code>,
-      <code>get_cache_name</code>,
-      <code>get_choices</code>,
-      <code>get_choices_default</code>,
-      <code>get_db_prep_lookup</code>,
-      <code>get_db_prep_save</code>,
-      <code>get_default</code>,
-      <code>get_flatchoices</code>,
-      <code>get_prep_lookup</code>,
-      <code>get_prep_value</code>,
-      <code>get_validator_unique_lookup_type</code>,
-      <code>has_default</code>,
-      <code>pre_save</code>,
-      <code>run_validators</code>,
-      <code>save_form_data</code>,
-      <code>set_attributes_from_name</code>,
-      <code>validate</code>,
-      <code>value_from_object</code>,
-      <code>value_to_string</code>
-      </p>
-    <div class="private">    <p class="indent-wrapped-lines"><b>Inherited from <code>django.db.models.fields.Field</code></b> (private):
-      <code>_description</code>,
-      <code>_get_choices</code>,
-      <code>_get_flatchoices</code>,
-      <code>_get_val_from_obj</code>
-      </p></div>
-    <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
-      <code>__delattr__</code>,
-      <code>__format__</code>,
-      <code>__getattribute__</code>,
-      <code>__hash__</code>,
-      <code>__new__</code>,
-      <code>__reduce__</code>,
-      <code>__reduce_ex__</code>,
-      <code>__setattr__</code>,
-      <code>__sizeof__</code>,
-      <code>__str__</code>,
-      <code>__subclasshook__</code>
-      </p>
-    </td>
-  </tr>
 </table>
 <!-- ==================== CLASS VARIABLES ==================== -->
 <a name="section-ClassVariables"></a>
@@ -269,206 +168,14 @@
     </table>
   </td>
 </tr>
-  <tr>
-    <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code>django.db.models.fields.Field</code></b>:
-      <code>auto_creation_counter</code>,
-      <code>creation_counter</code>,
-      <code>default_error_messages</code>,
-      <code>default_validators</code>,
-      <code>empty_strings_allowed</code>
-      </p>
+<tr>
+    <td width="15%" align="right" valign="top" class="summary">
+      <span class="summary-type">&nbsp;</span>
+    </td><td class="summary">
+        <a name="__metaclass__"></a><span class="summary-name">__metaclass__</span> = <code title="models.SubfieldBase">models.SubfieldBase</code>
     </td>
   </tr>
 </table>
-<!-- ==================== PROPERTIES ==================== -->
-<a name="section-Properties"></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">Properties</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Properties"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-  <tr>
-    <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code>django.db.models.fields.Field</code></b>:
-      <code>choices</code>,
-      <code>description</code>,
-      <code>flatchoices</code>,
-      <code>unique</code>
-      </p>
-    <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
-      <code>__class__</code>
-      </p>
-    </td>
-  </tr>
-</table>
-<!-- ==================== METHOD DETAILS ==================== -->
-<a name="section-MethodDetails"></a>
-<table class="details" 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">Method Details</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-MethodDetails"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-</table>
-<a name="__init__"></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">__init__</span>(<span class="sig-arg">self</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="oauth2client.django_orm-pysrc.html#FlowField.__init__">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-x.__init__(...) initializes x; see x.__class__.__doc__ for signature
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        object.__init__
-        <dd><em class="note">(inherited documentation)</em></dd>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="get_internal_type"></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">get_internal_type</span>(<span class="sig-arg">self</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.django_orm-pysrc.html#FlowField.get_internal_type">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  
-  <dl class="fields">
-    <dt>Overrides:
-        django.db.models.fields.Field.get_internal_type
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="to_python"></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_python</span>(<span class="sig-arg">self</span>,
-        <span class="sig-arg">value</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.django_orm-pysrc.html#FlowField.to_python">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-
-Converts the input value into the expected Python data type, raising
-django.core.exceptions.ValidationError if the data can't be converted.
-Returns the converted value. Subclasses should override this.
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        django.db.models.fields.Field.to_python
-        <dd><em class="note">(inherited documentation)</em></dd>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="get_db_prep_value"></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">get_db_prep_value</span>(<span class="sig-arg">self</span>,
-        <span class="sig-arg">value</span>,
-        <span class="sig-arg">connection</span>,
-        <span class="sig-arg">prepared</span>=<span class="sig-default">False</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.django_orm-pysrc.html#FlowField.get_db_prep_value">source&nbsp;code</a></span>&nbsp;
-    </td>
-  </tr></table>
-  
-  <pre class="literalblock">
-Returns field's value prepared for interacting with the database
-backend.
-
-Used by the default implementations of ``get_db_prep_save``and
-`get_db_prep_lookup```
-
-</pre>
-  <dl class="fields">
-    <dt>Overrides:
-        django.db.models.fields.Field.get_db_prep_value
-        <dd><em class="note">(inherited documentation)</em></dd>
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<a name="contribute_to_class"></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">contribute_to_class</span>(<span class="sig-arg">self</span>,
-        <span class="sig-arg">cls</span>,
-        <span class="sig-arg">name</span>)</span>
-  </h3>
-  </td><td align="right" valign="top"
-    >&nbsp;
-    </td>
-  </tr></table>
-  
-  
-  <dl class="fields">
-    <dt>Overrides:
-        django.db.models.fields.Field.contribute_to_class
-    </dt>
-  </dl>
-</td></tr></table>
-</div>
-<br />
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -492,7 +199,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.django_orm.Storage-class.html b/docs/epy/oauth2client.django_orm.Storage-class.html
index d27df47..a11553a 100644
--- a/docs/epy/oauth2client.django_orm.Storage-class.html
+++ b/docs/epy/oauth2client.django_orm.Storage-class.html
@@ -55,11 +55,11 @@
 <!-- ==================== CLASS DESCRIPTION ==================== -->
 <h1 class="epydoc">Class Storage</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.django_orm-pysrc.html#Storage">source&nbsp;code</a></span></p>
 <center>
-<center>  <map id="class_hierarchy_for_storage_3" name="class_hierarchy_for_storage_3">
+<center>  <map id="class_hierarchy_for_storage_2" name="class_hierarchy_for_storage_2">
 <area shape="rect" href="oauth2client.client.Storage-class.html" title="client.Storage" alt="" coords="5,5,107,32"/>
-<area shape="rect" href="oauth2client.django_orm.Storage-class.html" title="Storage" alt="" coords="23,61,89,88"/>
+<area shape="rect" href="oauth2client.django_orm.Storage-class.html" title="Storage" alt="" coords="131,5,197,32"/>
 </map>
-  <img src="class_hierarchy_for_storage_3.gif" alt='' usemap="#class_hierarchy_for_storage_3" ismap="ismap" class="graph-without-title" />
+  <img src="class_hierarchy_for_storage_2.gif" alt='' usemap="#class_hierarchy_for_storage_2" ismap="ismap" class="graph-without-title" />
 </center>
 </center>
 <hr />
@@ -374,7 +374,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.file-module.html b/docs/epy/oauth2client.file-module.html
index ff15014..8e5524e 100644
--- a/docs/epy/oauth2client.file-module.html
+++ b/docs/epy/oauth2client.file-module.html
@@ -99,31 +99,6 @@
     </td>
   </tr>
 </table>
-<!-- ==================== VARIABLES ==================== -->
-<a name="section-Variables"></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">Variables</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Variables"
-         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">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
-</table>
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -147,7 +122,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.file-pysrc.html b/docs/epy/oauth2client.file-pysrc.html
index d3b36c0..8197179 100644
--- a/docs/epy/oauth2client.file-pysrc.html
+++ b/docs/epy/oauth2client.file-pysrc.html
@@ -219,7 +219,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.file.CredentialsFileSymbolicLinkError-class.html b/docs/epy/oauth2client.file.CredentialsFileSymbolicLinkError-class.html
index 2c10919..fc0a2f4 100644
--- a/docs/epy/oauth2client.file.CredentialsFileSymbolicLinkError-class.html
+++ b/docs/epy/oauth2client.file.CredentialsFileSymbolicLinkError-class.html
@@ -166,7 +166,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.file.Storage-class.html b/docs/epy/oauth2client.file.Storage-class.html
index 6f85370..2c53f0d 100644
--- a/docs/epy/oauth2client.file.Storage-class.html
+++ b/docs/epy/oauth2client.file.Storage-class.html
@@ -55,11 +55,11 @@
 <!-- ==================== CLASS DESCRIPTION ==================== -->
 <h1 class="epydoc">Class Storage</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.file-pysrc.html#Storage">source&nbsp;code</a></span></p>
 <center>
-<center>  <map id="class_hierarchy_for_storage_4" name="class_hierarchy_for_storage_4">
+<center>  <map id="class_hierarchy_for_storage_3" name="class_hierarchy_for_storage_3">
 <area shape="rect" href="oauth2client.client.Storage-class.html" title="client.Storage" alt="" coords="5,5,107,32"/>
-<area shape="rect" href="oauth2client.file.Storage-class.html" title="Storage" alt="" coords="23,61,89,88"/>
+<area shape="rect" href="oauth2client.file.Storage-class.html" title="Storage" alt="" coords="131,5,197,32"/>
 </map>
-  <img src="class_hierarchy_for_storage_4.gif" alt='' usemap="#class_hierarchy_for_storage_4" ismap="ismap" class="graph-without-title" />
+  <img src="class_hierarchy_for_storage_3.gif" alt='' usemap="#class_hierarchy_for_storage_3" ismap="ismap" class="graph-without-title" />
 </center>
 </center>
 <hr />
@@ -512,7 +512,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:46 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.gce-module.html b/docs/epy/oauth2client.gce-module.html
index b8d6280..9f2c654 100644
--- a/docs/epy/oauth2client.gce-module.html
+++ b/docs/epy/oauth2client.gce-module.html
@@ -118,15 +118,8 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a href="oauth2client.gce-module.html#META" class="summary-name">META</a> = <code title="'http://metadata.google.internal/0.1/meta-data/service-accounts/defaul\
-t/acquire{?scope}'"><code class="variable-quote">'</code><code class="variable-string">http://metadata.google.internal/0.1/meta-data/service-</code><code class="variable-ellipsis">...</code></code>
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
+        <a href="oauth2client.gce-module.html#META" class="summary-name">META</a> = <code title="'http://metadata.google.internal/0.1/meta-data/service-accounts/' 'def\
+ault/acquire{?scope}'">'http://metadata.google.internal/0.1/meta-data/service-<code class="variable-ellipsis">...</code></code>
     </td>
   </tr>
 </table>
@@ -160,8 +153,8 @@
   <dl class="fields">
     <dt>Value:</dt>
       <dd><table><tr><td><pre class="variable">
-<code class="variable-quote">'</code><code class="variable-string">http://metadata.google.internal/0.1/meta-data/service-accounts/defaul</code><span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
-<code class="variable-string">t/acquire{?scope}</code><code class="variable-quote">'</code>
+'http://metadata.google.internal/0.1/meta-data/service-accounts/' 'def<span class="variable-linewrap"><img src="crarr.png" alt="\" /></span>
+ault/acquire{?scope}'
 </pre></td></tr></table>
 </dd>
   </dl>
@@ -191,7 +184,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.gce-pysrc.html b/docs/epy/oauth2client.gce-pysrc.html
index 6205b35..562bd99 100644
--- a/docs/epy/oauth2client.gce-pysrc.html
+++ b/docs/epy/oauth2client.gce-pysrc.html
@@ -229,7 +229,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.gce.AppAssertionCredentials-class.html b/docs/epy/oauth2client.gce.AppAssertionCredentials-class.html
index b7e346b..3aba0f2 100644
--- a/docs/epy/oauth2client.gce.AppAssertionCredentials-class.html
+++ b/docs/epy/oauth2client.gce.AppAssertionCredentials-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class AppAssertionCredentials</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.gce-pysrc.html#AppAssertionCredentials">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_appasserti_2" name="class_hierarchy_for_appasserti_2">
-<area shape="rect" href="oauth2client.client.AssertionCredentials-class.html" title="client.AssertionCredentials" alt="" coords="5,117,181,144"/>
-<area shape="rect" href="oauth2client.gce.AppAssertionCredentials-class.html" title="AppAssertionCredentials" alt="" coords="12,173,175,200"/>
-<area shape="rect" href="oauth2client.client.Credentials-class.html" title="client.Credentials" alt="" coords="33,5,153,32"/>
-<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="client.OAuth2Credentials" alt="" coords="11,61,176,88"/>
+<area shape="rect" href="oauth2client.client.AssertionCredentials-class.html" title="client.AssertionCredentials" alt="" coords="5,5,181,32"/>
+<area shape="rect" href="oauth2client.client.Credentials-class.html" title="client.Credentials" alt="" coords="205,5,325,32"/>
+<area shape="rect" href="oauth2client.client.OAuth2Credentials-class.html" title="client.OAuth2Credentials" alt="" coords="349,5,515,32"/>
+<area shape="rect" href="oauth2client.gce.AppAssertionCredentials-class.html" title="AppAssertionCredentials" alt="" coords="539,5,701,32"/>
 </map>
   <img src="class_hierarchy_for_appasserti_2.gif" alt='' usemap="#class_hierarchy_for_appasserti_2" ismap="ismap" class="graph-without-title" />
 </center>
@@ -102,11 +102,12 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.gce.AppAssertionCredentials-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">*args</span>,
+          <td><span class="summary-sig"><a href="oauth2client.gce.AppAssertionCredentials-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">scope</span>,
         <span class="summary-sig-arg">**kwargs</span>)</span><br />
       Constructor for AppAssertionCredentials</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.gce-pysrc.html#AppAssertionCredentials.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -141,6 +142,7 @@
     <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.client.OAuth2Credentials-class.html">client.OAuth2Credentials</a></code></b>:
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#__getstate__">__getstate__</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#__setstate__">__setstate__</a></code>,
+      <code><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#apply">apply</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#authorize">authorize</a></code>,
       <code><a href="oauth2client.client.OAuth2Credentials-class.html#refresh">refresh</a></code>,
@@ -259,9 +261,6 @@
 </tr>
   <tr>
     <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code><a href="oauth2client.client.OAuth2Credentials-class.html">client.OAuth2Credentials</a></code></b>:
-      <code><a href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired">access_token_expired</a></code>
-      </p>
     <p class="indent-wrapped-lines"><b>Inherited from <code>object</code></b>:
       <code>__class__</code>
       </p>
@@ -293,12 +292,13 @@
 <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">*args</span>,
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">scope</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="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.gce-pysrc.html#AppAssertionCredentials.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -415,7 +415,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.keyring_storage-module.html b/docs/epy/oauth2client.keyring_storage-module.html
index 742b3f7..adbd0da 100644
--- a/docs/epy/oauth2client.keyring_storage-module.html
+++ b/docs/epy/oauth2client.keyring_storage-module.html
@@ -90,31 +90,6 @@
     </td>
   </tr>
 </table>
-<!-- ==================== VARIABLES ==================== -->
-<a name="section-Variables"></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">Variables</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-Variables"
-         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">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
-</table>
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -138,7 +113,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.keyring_storage-pysrc.html b/docs/epy/oauth2client.keyring_storage-pysrc.html
index bb7dda6..f7124f9 100644
--- a/docs/epy/oauth2client.keyring_storage-pysrc.html
+++ b/docs/epy/oauth2client.keyring_storage-pysrc.html
@@ -201,7 +201,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.keyring_storage.Storage-class.html b/docs/epy/oauth2client.keyring_storage.Storage-class.html
index 4ebbddd..0e7d07c 100644
--- a/docs/epy/oauth2client.keyring_storage.Storage-class.html
+++ b/docs/epy/oauth2client.keyring_storage.Storage-class.html
@@ -55,11 +55,11 @@
 <!-- ==================== CLASS DESCRIPTION ==================== -->
 <h1 class="epydoc">Class Storage</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.keyring_storage-pysrc.html#Storage">source&nbsp;code</a></span></p>
 <center>
-<center>  <map id="class_hierarchy_for_storage_5" name="class_hierarchy_for_storage_5">
+<center>  <map id="class_hierarchy_for_storage_4" name="class_hierarchy_for_storage_4">
 <area shape="rect" href="oauth2client.client.Storage-class.html" title="client.Storage" alt="" coords="5,5,107,32"/>
-<area shape="rect" href="oauth2client.keyring_storage.Storage-class.html" title="Storage" alt="" coords="23,61,89,88"/>
+<area shape="rect" href="oauth2client.keyring_storage.Storage-class.html" title="Storage" alt="" coords="131,5,197,32"/>
 </map>
-  <img src="class_hierarchy_for_storage_5.gif" alt='' usemap="#class_hierarchy_for_storage_5" ismap="ismap" class="graph-without-title" />
+  <img src="class_hierarchy_for_storage_4.gif" alt='' usemap="#class_hierarchy_for_storage_4" ismap="ismap" class="graph-without-title" />
 </center>
 </center>
 <hr />
@@ -470,7 +470,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:15 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.locked_file-module.html b/docs/epy/oauth2client.locked_file-module.html
index 22e3115..c03ec2a 100644
--- a/docs/epy/oauth2client.locked_file-module.html
+++ b/docs/epy/oauth2client.locked_file-module.html
@@ -124,14 +124,6 @@
       Lock files using Posix advisory lock files.
     </td>
   </tr>
-<tr class="private">
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a href="oauth2client.locked_file._FcntlOpener-class.html" class="summary-name" onclick="show_private();">_FcntlOpener</a><br />
-      Open, lock, and unlock a file using fcntl.lockf.
-    </td>
-  </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
@@ -203,14 +195,14 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="_Win32Opener"></a><span class="summary-name">_Win32Opener</span> = <code title="None">None</code>
+        <a name="_FcntlOpener"></a><span class="summary-name">_FcntlOpener</span> = <code title="None">None</code>
     </td>
   </tr>
-<tr>
+<tr class="private">
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
+        <a name="_Win32Opener"></a><span class="summary-name">_Win32Opener</span> = <code title="None">None</code>
     </td>
   </tr>
 </table>
@@ -237,7 +229,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.locked_file-pysrc.html b/docs/epy/oauth2client.locked_file-pysrc.html
index 7c7a65b..4242776 100644
--- a/docs/epy/oauth2client.locked_file-pysrc.html
+++ b/docs/epy/oauth2client.locked_file-pysrc.html
@@ -297,7 +297,7 @@
 <a name="L216"></a><tt class="py-lineno">216</tt>  <tt class="py-line">      <tt class="py-keyword">if</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_fh</tt><tt class="py-op">:</tt> </tt>
 <a name="L217"></a><tt class="py-lineno">217</tt>  <tt class="py-line">        <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_fh</tt><tt class="py-op">.</tt><tt class="py-name">close</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 </div></div><a name="L218"></a><tt class="py-lineno">218</tt>  <tt class="py-line"><tt class="py-keyword">except</tt> <tt class="py-name">ImportError</tt><tt class="py-op">:</tt> </tt>
-<a name="L219"></a><tt class="py-lineno">219</tt>  <tt class="py-line">  <tt id="link-16" class="py-name" targets="Class oauth2client.locked_file._FcntlOpener=oauth2client.locked_file._FcntlOpener-class.html"><a title="oauth2client.locked_file._FcntlOpener" class="py-name" href="#" onclick="return doclink('link-16', '_FcntlOpener', 'link-16');">_FcntlOpener</a></tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
+<a name="L219"></a><tt class="py-lineno">219</tt>  <tt class="py-line">  <tt id="link-16" class="py-name" targets="Variable oauth2client.locked_file._FcntlOpener=oauth2client.locked_file-module.html#_FcntlOpener"><a title="oauth2client.locked_file._FcntlOpener" class="py-name" href="#" onclick="return doclink('link-16', '_FcntlOpener', 'link-16');">_FcntlOpener</a></tt> <tt class="py-op">=</tt> <tt class="py-name">None</tt> </tt>
 <a name="L220"></a><tt class="py-lineno">220</tt>  <tt class="py-line"> </tt>
 <a name="L221"></a><tt class="py-lineno">221</tt>  <tt class="py-line"> </tt>
 <a name="L222"></a><tt class="py-lineno">222</tt>  <tt class="py-line"><tt class="py-keyword">try</tt><tt class="py-op">:</tt> </tt>
@@ -447,15 +447,13 @@
 <a name="L354"></a><tt class="py-lineno">354</tt>  <tt class="py-line"><tt class="py-docstring">      AlreadyLockedException: if the lock is already acquired.</tt> </tt>
 <a name="L355"></a><tt class="py-lineno">355</tt>  <tt class="py-line"><tt class="py-docstring">      IOError: if the open fails.</tt> </tt>
 <a name="L356"></a><tt class="py-lineno">356</tt>  <tt class="py-line"><tt class="py-docstring">    """</tt> </tt>
-<a name="L357"></a><tt class="py-lineno">357</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_opener</tt><tt class="py-op">.</tt><tt id="link-34" class="py-name" targets="Method oauth2client.locked_file.LockedFile.open_and_lock()=oauth2client.locked_file.LockedFile-class.html#open_and_lock,Method oauth2client.locked_file._FcntlOpener.open_and_lock()=oauth2client.locked_file._FcntlOpener-class.html#open_and_lock,Method oauth2client.locked_file._Opener.open_and_lock()=oauth2client.locked_file._Opener-class.html#open_and_lock,Method oauth2client.locked_file._PosixOpener.open_and_lock()=oauth2client.locked_file._PosixOpener-class.html#open_and_lock"><a title="oauth2client.locked_file.LockedFile.open_and_lock
-oauth2client.locked_file._FcntlOpener.open_and_lock
+<a name="L357"></a><tt class="py-lineno">357</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_opener</tt><tt class="py-op">.</tt><tt id="link-34" class="py-name" targets="Method oauth2client.locked_file.LockedFile.open_and_lock()=oauth2client.locked_file.LockedFile-class.html#open_and_lock,Method oauth2client.locked_file._Opener.open_and_lock()=oauth2client.locked_file._Opener-class.html#open_and_lock,Method oauth2client.locked_file._PosixOpener.open_and_lock()=oauth2client.locked_file._PosixOpener-class.html#open_and_lock"><a title="oauth2client.locked_file.LockedFile.open_and_lock
 oauth2client.locked_file._Opener.open_and_lock
 oauth2client.locked_file._PosixOpener.open_and_lock" class="py-name" href="#" onclick="return doclink('link-34', 'open_and_lock', 'link-34');">open_and_lock</a></tt><tt class="py-op">(</tt><tt class="py-name">timeout</tt><tt class="py-op">,</tt> <tt class="py-name">delay</tt><tt class="py-op">)</tt> </tt>
 </div><a name="L358"></a><tt class="py-lineno">358</tt>  <tt class="py-line"> </tt>
 <a name="LockedFile.unlock_and_close"></a><div id="LockedFile.unlock_and_close-def"><a name="L359"></a><tt class="py-lineno">359</tt> <a class="py-toggle" href="#" id="LockedFile.unlock_and_close-toggle" onclick="return toggle('LockedFile.unlock_and_close');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.locked_file.LockedFile-class.html#unlock_and_close">unlock_and_close</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="LockedFile.unlock_and_close-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="LockedFile.unlock_and_close-expanded"><a name="L360"></a><tt class="py-lineno">360</tt>  <tt class="py-line">    <tt class="py-docstring">"""Unlock and close a file."""</tt> </tt>
-<a name="L361"></a><tt class="py-lineno">361</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_opener</tt><tt class="py-op">.</tt><tt id="link-35" class="py-name" targets="Method oauth2client.locked_file.LockedFile.unlock_and_close()=oauth2client.locked_file.LockedFile-class.html#unlock_and_close,Method oauth2client.locked_file._FcntlOpener.unlock_and_close()=oauth2client.locked_file._FcntlOpener-class.html#unlock_and_close,Method oauth2client.locked_file._Opener.unlock_and_close()=oauth2client.locked_file._Opener-class.html#unlock_and_close,Method oauth2client.locked_file._PosixOpener.unlock_and_close()=oauth2client.locked_file._PosixOpener-class.html#unlock_and_close"><a title="oauth2client.locked_file.LockedFile.unlock_and_close
-oauth2client.locked_file._FcntlOpener.unlock_and_close
+<a name="L361"></a><tt class="py-lineno">361</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_opener</tt><tt class="py-op">.</tt><tt id="link-35" class="py-name" targets="Method oauth2client.locked_file.LockedFile.unlock_and_close()=oauth2client.locked_file.LockedFile-class.html#unlock_and_close,Method oauth2client.locked_file._Opener.unlock_and_close()=oauth2client.locked_file._Opener-class.html#unlock_and_close,Method oauth2client.locked_file._PosixOpener.unlock_and_close()=oauth2client.locked_file._PosixOpener-class.html#unlock_and_close"><a title="oauth2client.locked_file.LockedFile.unlock_and_close
 oauth2client.locked_file._Opener.unlock_and_close
 oauth2client.locked_file._PosixOpener.unlock_and_close" class="py-name" href="#" onclick="return doclink('link-35', 'unlock_and_close', 'link-35');">unlock_and_close</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 </div></div><a name="L362"></a><tt class="py-lineno">362</tt>  <tt class="py-line"> </tt><script type="text/javascript">
@@ -488,7 +486,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.locked_file.AlreadyLockedException-class.html b/docs/epy/oauth2client.locked_file.AlreadyLockedException-class.html
index cd3fac8..41a9020 100644
--- a/docs/epy/oauth2client.locked_file.AlreadyLockedException-class.html
+++ b/docs/epy/oauth2client.locked_file.AlreadyLockedException-class.html
@@ -166,7 +166,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.locked_file.CredentialsFileSymbolicLinkError-class.html b/docs/epy/oauth2client.locked_file.CredentialsFileSymbolicLinkError-class.html
index c24ead7..adc217e 100644
--- a/docs/epy/oauth2client.locked_file.CredentialsFileSymbolicLinkError-class.html
+++ b/docs/epy/oauth2client.locked_file.CredentialsFileSymbolicLinkError-class.html
@@ -166,7 +166,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.locked_file.LockedFile-class.html b/docs/epy/oauth2client.locked_file.LockedFile-class.html
index 05d19e2..23b6d54 100644
--- a/docs/epy/oauth2client.locked_file.LockedFile-class.html
+++ b/docs/epy/oauth2client.locked_file.LockedFile-class.html
@@ -90,11 +90,14 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.locked_file.LockedFile-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 />
+          <td><span class="summary-sig"><a href="oauth2client.locked_file.LockedFile-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">filename</span>,
+        <span class="summary-sig-arg">mode</span>,
+        <span class="summary-sig-arg">fallback_mode</span>,
+        <span class="summary-sig-arg">use_native_locking</span>=<span class="summary-sig-default">True</span>)</span><br />
       Construct a LockedFile.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.locked_file-pysrc.html#LockedFile.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -258,12 +261,15 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">filename</span>,
+        <span class="sig-arg">mode</span>,
+        <span class="sig-arg">fallback_mode</span>,
+        <span class="sig-arg">use_native_locking</span>=<span class="sig-default">True</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.locked_file-pysrc.html#LockedFile.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -344,7 +350,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.locked_file._FcntlOpener-class.html b/docs/epy/oauth2client.locked_file._FcntlOpener-class.html
index ecf8b41..3ac7ed6 100644
--- a/docs/epy/oauth2client.locked_file._FcntlOpener-class.html
+++ b/docs/epy/oauth2client.locked_file._FcntlOpener-class.html
@@ -274,7 +274,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 12:25:05 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.locked_file._Opener-class.html b/docs/epy/oauth2client.locked_file._Opener-class.html
index f158b28..07708bb 100644
--- a/docs/epy/oauth2client.locked_file._Opener-class.html
+++ b/docs/epy/oauth2client.locked_file._Opener-class.html
@@ -55,18 +55,11 @@
 <!-- ==================== CLASS DESCRIPTION ==================== -->
 <h1 class="epydoc">Class _Opener</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.locked_file-pysrc.html#_Opener">source&nbsp;code</a></span></p>
 <center>
-  <div class="private"><center>  <map id="class_hierarchy_for__opener" name="class_hierarchy_for__opener">
-<area shape="rect" href="oauth2client.locked_file._FcntlOpener-class.html" title="_FcntlOpener" alt="" coords="5,61,104,88"/>
-<area shape="rect" href="oauth2client.locked_file._Opener-class.html" title="_Opener" alt="" coords="83,5,152,32"/>
-<area shape="rect" href="oauth2client.locked_file._PosixOpener-class.html" title="_PosixOpener" alt="" coords="128,61,232,88"/>
-</map>
-  <img src="class_hierarchy_for__opener.gif" alt='' usemap="#class_hierarchy_for__opener" ismap="ismap" class="graph-without-title" />
-</center></div>
-  <div class="public" style="display:none"><center>  <map id="class_hierarchy_for__opener_2" name="class_hierarchy_for__opener_2">
+<center>  <map id="class_hierarchy_for__opener" name="class_hierarchy_for__opener">
 <area shape="rect" href="oauth2client.locked_file._Opener-class.html" title="_Opener" alt="" coords="5,5,75,32"/>
 </map>
-  <img src="class_hierarchy_for__opener_2.gif" alt='' usemap="#class_hierarchy_for__opener_2" ismap="ismap" class="graph-without-title" />
-</center></div>
+  <img src="class_hierarchy_for__opener.gif" alt='' usemap="#class_hierarchy_for__opener" ismap="ismap" class="graph-without-title" />
+</center>
 </center>
 <hr />
 <pre class="literalblock">
@@ -368,7 +361,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.locked_file._PosixOpener-class.html b/docs/epy/oauth2client.locked_file._PosixOpener-class.html
index 98e3101..8f19965 100644
--- a/docs/epy/oauth2client.locked_file._PosixOpener-class.html
+++ b/docs/epy/oauth2client.locked_file._PosixOpener-class.html
@@ -56,8 +56,8 @@
 <h1 class="epydoc">Class _PosixOpener</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.locked_file-pysrc.html#_PosixOpener">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for__posixopen" name="class_hierarchy_for__posixopen">
-<area shape="rect" href="oauth2client.locked_file._Opener-class.html" title="_Opener" alt="" coords="23,5,92,32"/>
-<area shape="rect" href="oauth2client.locked_file._PosixOpener-class.html" title="_PosixOpener" alt="" coords="5,61,109,88"/>
+<area shape="rect" href="oauth2client.locked_file._Opener-class.html" title="_Opener" alt="" coords="5,5,75,32"/>
+<area shape="rect" href="oauth2client.locked_file._PosixOpener-class.html" title="_PosixOpener" alt="" coords="99,5,203,32"/>
 </map>
   <img src="class_hierarchy_for__posixopen.gif" alt='' usemap="#class_hierarchy_for__posixopen" ismap="ismap" class="graph-without-title" />
 </center>
@@ -294,7 +294,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.multistore_file-module.html b/docs/epy/oauth2client.multistore_file-module.html
index d3ae9bd..f88caa6 100644
--- a/docs/epy/oauth2client.multistore_file-module.html
+++ b/docs/epy/oauth2client.multistore_file-module.html
@@ -130,6 +130,45 @@
     </td>
   </tr>
 </table>
+<!-- ==================== FUNCTIONS ==================== -->
+<a name="section-Functions"></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">Functions</span></td>
+        <td align="right" valign="top"
+         ><span class="options">[<a href="#section-Functions"
+         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 href="oauth2client.multistore_file-module.html#get_credential_storage" class="summary-sig-name">get_credential_storage</a>(<span class="summary-sig-arg">filename</span>,
+        <span class="summary-sig-arg">client_id</span>,
+        <span class="summary-sig-arg">user_agent</span>,
+        <span class="summary-sig-arg">scope</span>,
+        <span class="summary-sig-arg">warn_on_readonly</span>=<span class="summary-sig-default">True</span>)</span><br />
+      Get a Storage instance for a credential.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="oauth2client.multistore_file-pysrc.html#get_credential_storage">source&nbsp;code</a></span>
+            
+          </td>
+        </tr>
+      </table>
+      
+    </td>
+  </tr>
+</table>
 <!-- ==================== VARIABLES ==================== -->
 <a name="section-Variables"></a>
 <table class="summary" border="1" cellpadding="3"
@@ -158,7 +197,7 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="_multistores"></a><span class="summary-name">_multistores</span> = <code title="{}"><code class="variable-group">{</code><code class="variable-group">}</code></code>
+        <a name="_multistores"></a><span class="summary-name">_multistores</span> = <code title="{}">{}</code>
     </td>
   </tr>
 <tr class="private">
@@ -168,14 +207,67 @@
         <a name="_multistores_lock"></a><span class="summary-name">_multistores_lock</span> = <code title="threading.Lock()">threading.Lock()</code>
     </td>
   </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
 </table>
+<!-- ==================== FUNCTION DETAILS ==================== -->
+<a name="section-FunctionDetails"></a>
+<table class="details" 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">Function Details</span></td>
+        <td align="right" valign="top"
+         ><span class="options">[<a href="#section-FunctionDetails"
+         class="privatelink" onclick="toggle_private();"
+         >hide private</a>]</span></td>
+      </tr>
+    </table>
+  </td>
+</tr>
+</table>
+<a name="get_credential_storage"></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">get_credential_storage</span>(<span class="sig-arg">filename</span>,
+        <span class="sig-arg">client_id</span>,
+        <span class="sig-arg">user_agent</span>,
+        <span class="sig-arg">scope</span>,
+        <span class="sig-arg">warn_on_readonly</span>=<span class="sig-default">True</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="oauth2client.multistore_file-pysrc.html#get_credential_storage">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+Get a Storage instance for a credential.
+
+Args:
+  filename: The JSON file storing a set of credentials
+  client_id: The client_id for the credential
+  user_agent: The user agent for the credential
+  scope: string or list of strings, Scope(s) being requested
+  warn_on_readonly: if True, log a warning if the store is readonly
+
+Returns:
+  An object derived from client.Storage for getting/setting the
+  credential.
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@util.positional(4)</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
+<br />
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -199,7 +291,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.multistore_file-pysrc.html b/docs/epy/oauth2client.multistore_file-pysrc.html
index a899e1c..eb63777 100644
--- a/docs/epy/oauth2client.multistore_file-pysrc.html
+++ b/docs/epy/oauth2client.multistore_file-pysrc.html
@@ -261,8 +261,7 @@
 <a name="_MultiStore._lock"></a><div id="_MultiStore._lock-def"><a name="L188"></a><tt class="py-lineno">188</tt> <a class="py-toggle" href="#" id="_MultiStore._lock-toggle" onclick="return toggle('_MultiStore._lock');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.multistore_file._MultiStore-class.html#_lock">_lock</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="_MultiStore._lock-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="_MultiStore._lock-expanded"><a name="L189"></a><tt class="py-lineno">189</tt>  <tt class="py-line">    <tt class="py-docstring">"""Lock the entire multistore."""</tt> </tt>
 <a name="L190"></a><tt class="py-lineno">190</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_thread_lock</tt><tt class="py-op">.</tt><tt class="py-name">acquire</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
-<a name="L191"></a><tt class="py-lineno">191</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_file</tt><tt class="py-op">.</tt><tt id="link-37" class="py-name" targets="Method oauth2client.locked_file.LockedFile.open_and_lock()=oauth2client.locked_file.LockedFile-class.html#open_and_lock,Method oauth2client.locked_file._FcntlOpener.open_and_lock()=oauth2client.locked_file._FcntlOpener-class.html#open_and_lock,Method oauth2client.locked_file._Opener.open_and_lock()=oauth2client.locked_file._Opener-class.html#open_and_lock,Method oauth2client.locked_file._PosixOpener.open_and_lock()=oauth2client.locked_file._PosixOpener-class.html#open_and_lock"><a title="oauth2client.locked_file.LockedFile.open_and_lock
-oauth2client.locked_file._FcntlOpener.open_and_lock
+<a name="L191"></a><tt class="py-lineno">191</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_file</tt><tt class="py-op">.</tt><tt id="link-37" class="py-name" targets="Method oauth2client.locked_file.LockedFile.open_and_lock()=oauth2client.locked_file.LockedFile-class.html#open_and_lock,Method oauth2client.locked_file._Opener.open_and_lock()=oauth2client.locked_file._Opener-class.html#open_and_lock,Method oauth2client.locked_file._PosixOpener.open_and_lock()=oauth2client.locked_file._PosixOpener-class.html#open_and_lock"><a title="oauth2client.locked_file.LockedFile.open_and_lock
 oauth2client.locked_file._Opener.open_and_lock
 oauth2client.locked_file._PosixOpener.open_and_lock" class="py-name" href="#" onclick="return doclink('link-37', 'open_and_lock', 'link-37');">open_and_lock</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L192"></a><tt class="py-lineno">192</tt>  <tt class="py-line">    <tt class="py-keyword">if</tt> <tt class="py-keyword">not</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_file</tt><tt class="py-op">.</tt><tt id="link-38" class="py-name" targets="Method oauth2client.locked_file.LockedFile.is_locked()=oauth2client.locked_file.LockedFile-class.html#is_locked,Method oauth2client.locked_file._Opener.is_locked()=oauth2client.locked_file._Opener-class.html#is_locked"><a title="oauth2client.locked_file.LockedFile.is_locked
@@ -303,8 +302,7 @@
 </div><a name="L210"></a><tt class="py-lineno">210</tt>  <tt class="py-line"> </tt>
 <a name="_MultiStore._unlock"></a><div id="_MultiStore._unlock-def"><a name="L211"></a><tt class="py-lineno">211</tt> <a class="py-toggle" href="#" id="_MultiStore._unlock-toggle" onclick="return toggle('_MultiStore._unlock');">-</a><tt class="py-line">  <tt class="py-keyword">def</tt> <a class="py-def-name" href="oauth2client.multistore_file._MultiStore-class.html#_unlock">_unlock</a><tt class="py-op">(</tt><tt class="py-param">self</tt><tt class="py-op">)</tt><tt class="py-op">:</tt> </tt>
 </div><div id="_MultiStore._unlock-collapsed" style="display:none;" pad="+++" indent="++++++"></div><div id="_MultiStore._unlock-expanded"><a name="L212"></a><tt class="py-lineno">212</tt>  <tt class="py-line">    <tt class="py-docstring">"""Release the lock on the multistore."""</tt> </tt>
-<a name="L213"></a><tt class="py-lineno">213</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_file</tt><tt class="py-op">.</tt><tt id="link-45" class="py-name" targets="Method oauth2client.locked_file.LockedFile.unlock_and_close()=oauth2client.locked_file.LockedFile-class.html#unlock_and_close,Method oauth2client.locked_file._FcntlOpener.unlock_and_close()=oauth2client.locked_file._FcntlOpener-class.html#unlock_and_close,Method oauth2client.locked_file._Opener.unlock_and_close()=oauth2client.locked_file._Opener-class.html#unlock_and_close,Method oauth2client.locked_file._PosixOpener.unlock_and_close()=oauth2client.locked_file._PosixOpener-class.html#unlock_and_close"><a title="oauth2client.locked_file.LockedFile.unlock_and_close
-oauth2client.locked_file._FcntlOpener.unlock_and_close
+<a name="L213"></a><tt class="py-lineno">213</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_file</tt><tt class="py-op">.</tt><tt id="link-45" class="py-name" targets="Method oauth2client.locked_file.LockedFile.unlock_and_close()=oauth2client.locked_file.LockedFile-class.html#unlock_and_close,Method oauth2client.locked_file._Opener.unlock_and_close()=oauth2client.locked_file._Opener-class.html#unlock_and_close,Method oauth2client.locked_file._PosixOpener.unlock_and_close()=oauth2client.locked_file._PosixOpener-class.html#unlock_and_close"><a title="oauth2client.locked_file.LockedFile.unlock_and_close
 oauth2client.locked_file._Opener.unlock_and_close
 oauth2client.locked_file._PosixOpener.unlock_and_close" class="py-name" href="#" onclick="return doclink('link-45', 'unlock_and_close', 'link-45');">unlock_and_close</a></tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
 <a name="L214"></a><tt class="py-lineno">214</tt>  <tt class="py-line">    <tt class="py-name">self</tt><tt class="py-op">.</tt><tt class="py-name">_thread_lock</tt><tt class="py-op">.</tt><tt class="py-name">release</tt><tt class="py-op">(</tt><tt class="py-op">)</tt> </tt>
@@ -540,7 +538,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.multistore_file.Error-class.html b/docs/epy/oauth2client.multistore_file.Error-class.html
index d7a5c72..72b71fc 100644
--- a/docs/epy/oauth2client.multistore_file.Error-class.html
+++ b/docs/epy/oauth2client.multistore_file.Error-class.html
@@ -59,7 +59,6 @@
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 <area shape="rect" href="oauth2client.multistore_file.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="oauth2client.multistore_file.NewerCredentialStoreError-class.html" title="NewerCredentialStoreError" alt="" coords="7,173,180,200"/>
 </map>
   <img src="class_hierarchy_for_error_4.gif" alt='' usemap="#class_hierarchy_for_error_4" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +166,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.multistore_file.NewerCredentialStoreError-class.html b/docs/epy/oauth2client.multistore_file.NewerCredentialStoreError-class.html
index 8104082..6b2bce5 100644
--- a/docs/epy/oauth2client.multistore_file.NewerCredentialStoreError-class.html
+++ b/docs/epy/oauth2client.multistore_file.NewerCredentialStoreError-class.html
@@ -59,7 +59,7 @@
 <area shape="rect" href="javascript:void(0);" title="exceptions.BaseException" alt="" coords="5,5,181,32"/>
 <area shape="rect" href="javascript:void(0);" title="exceptions.Exception" alt="" coords="20,61,167,88"/>
 <area shape="rect" href="oauth2client.multistore_file.Error-class.html" title="Error" alt="" coords="69,117,117,144"/>
-<area shape="rect" href="oauth2client.multistore_file.NewerCredentialStoreError-class.html" title="NewerCredentialStoreError" alt="" coords="7,173,180,200"/>
+<area shape="rect" href="oauth2client.multistore_file.NewerCredentialStoreError-class.html" title="NewerCredentialStoreError" alt="" coords="205,5,379,32"/>
 </map>
   <img src="class_hierarchy_for_newercrede.gif" alt='' usemap="#class_hierarchy_for_newercrede" ismap="ismap" class="graph-without-title" />
 </center>
@@ -167,7 +167,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.multistore_file._MultiStore-class.html b/docs/epy/oauth2client.multistore_file._MultiStore-class.html
index 9a6483f..5a4ff0c 100644
--- a/docs/epy/oauth2client.multistore_file._MultiStore-class.html
+++ b/docs/epy/oauth2client.multistore_file._MultiStore-class.html
@@ -116,11 +116,12 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.multistore_file._MultiStore-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 />
+          <td><span class="summary-sig"><a href="oauth2client.multistore_file._MultiStore-class.html#__init__" class="summary-sig-name">__init__</a>(<span class="summary-sig-arg">self</span>,
+        <span class="summary-sig-arg">filename</span>,
+        <span class="summary-sig-arg">warn_on_readonly</span>=<span class="summary-sig-default">True</span>)</span><br />
       Initialize the class.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.multistore_file-pysrc.html#_MultiStore.__init__">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -414,12 +415,13 @@
 <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">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<span class="sig-arg">self</span>,
+        <span class="sig-arg">filename</span>,
+        <span class="sig-arg">warn_on_readonly</span>=<span class="sig-default">True</span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.multistore_file-pysrc.html#_MultiStore.__init__">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -758,7 +760,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.multistore_file._MultiStore._Storage-class.html b/docs/epy/oauth2client.multistore_file._MultiStore._Storage-class.html
index a8f9d7b..9a3e05a 100644
--- a/docs/epy/oauth2client.multistore_file._MultiStore._Storage-class.html
+++ b/docs/epy/oauth2client.multistore_file._MultiStore._Storage-class.html
@@ -58,7 +58,7 @@
 <center>
 <center>  <map id="class_hierarchy_for__storage" name="class_hierarchy_for__storage">
 <area shape="rect" href="oauth2client.client.Storage-class.html" title="client.Storage" alt="" coords="5,5,107,32"/>
-<area shape="rect" href="oauth2client.multistore_file._MultiStore._Storage-class.html" title="_Storage" alt="" coords="20,61,92,88"/>
+<area shape="rect" href="oauth2client.multistore_file._MultiStore._Storage-class.html" title="_Storage" alt="" coords="131,5,203,32"/>
 </map>
   <img src="class_hierarchy_for__storage.gif" alt='' usemap="#class_hierarchy_for__storage" ismap="ismap" class="graph-without-title" />
 </center>
@@ -461,7 +461,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.tools-module.html b/docs/epy/oauth2client.tools-module.html
index 1f7763a..f142456 100644
--- a/docs/epy/oauth2client.tools-module.html
+++ b/docs/epy/oauth2client.tools-module.html
@@ -123,11 +123,12 @@
     </td><td class="summary">
       <table width="100%" cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td><span class="summary-sig"><a href="oauth2client.tools-module.html#run" class="summary-sig-name">run</a>(<span class="summary-sig-arg">*args</span>,
-        <span class="summary-sig-arg">**kwargs</span>)</span><br />
+          <td><span class="summary-sig"><a href="oauth2client.tools-module.html#run" class="summary-sig-name">run</a>(<span class="summary-sig-arg">flow</span>,
+        <span class="summary-sig-arg">storage</span>,
+        <span class="summary-sig-arg">http</span>=<span class="summary-sig-default">None</span>)</span><br />
       Core code for a command-line application.</td>
           <td align="right" valign="top">
-            <span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>
+            <span class="codelink"><a href="oauth2client.tools-pysrc.html#run">source&nbsp;code</a></span>
             
           </td>
         </tr>
@@ -160,13 +161,6 @@
         <a name="FLAGS"></a><span class="summary-name">FLAGS</span> = <code title="gflags.FLAGS">gflags.FLAGS</code>
     </td>
   </tr>
-<tr class="private">
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
 </table>
 <!-- ==================== FUNCTION DETAILS ==================== -->
 <a name="section-FunctionDetails"></a>
@@ -193,11 +187,12 @@
 <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">run</span>(<span class="sig-arg">*args</span>,
-        <span class="sig-arg">**kwargs</span>)</span>
+  <h3 class="epydoc"><span class="sig"><span class="sig-name">run</span>(<span class="sig-arg">flow</span>,
+        <span class="sig-arg">storage</span>,
+        <span class="sig-arg">http</span>=<span class="sig-default">None</span>)</span>
   </h3>
   </td><td align="right" valign="top"
-    ><span class="codelink"><a href="oauth2client.util-pysrc.html">source&nbsp;code</a></span>&nbsp;
+    ><span class="codelink"><a href="oauth2client.tools-pysrc.html#run">source&nbsp;code</a></span>&nbsp;
     </td>
   </tr></table>
   
@@ -246,7 +241,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.tools-pysrc.html b/docs/epy/oauth2client.tools-pysrc.html
index 0330785..e886d72 100644
--- a/docs/epy/oauth2client.tools-pysrc.html
+++ b/docs/epy/oauth2client.tools-pysrc.html
@@ -282,7 +282,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.tools.ClientRedirectHandler-class.html b/docs/epy/oauth2client.tools.ClientRedirectHandler-class.html
index 3eeddbe..df7bb75 100644
--- a/docs/epy/oauth2client.tools.ClientRedirectHandler-class.html
+++ b/docs/epy/oauth2client.tools.ClientRedirectHandler-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class ClientRedirectHandler</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.tools-pysrc.html#ClientRedirectHandler">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_clientredi" name="class_hierarchy_for_clientredi">
-<area shape="rect" href="javascript:void(0);" title="BaseHTTPServer.BaseHTTPRequestHandler" alt="" coords="5,117,283,144"/>
-<area shape="rect" href="oauth2client.tools.ClientRedirectHandler-class.html" title="ClientRedirectHandler" alt="" coords="71,173,217,200"/>
-<area shape="rect" href="javascript:void(0);" title="SocketServer.BaseRequestHandler" alt="" coords="32,5,256,32"/>
-<area shape="rect" href="javascript:void(0);" title="SocketServer.StreamRequestHandler" alt="" coords="27,61,261,88"/>
+<area shape="rect" href="javascript:void(0);" title="BaseHTTPServer.BaseHTTPRequestHandler" alt="" coords="5,5,283,32"/>
+<area shape="rect" href="javascript:void(0);" title="SocketServer.BaseRequestHandler" alt="" coords="307,5,531,32"/>
+<area shape="rect" href="javascript:void(0);" title="SocketServer.StreamRequestHandler" alt="" coords="555,5,789,32"/>
+<area shape="rect" href="oauth2client.tools.ClientRedirectHandler-class.html" title="ClientRedirectHandler" alt="" coords="813,5,960,32"/>
 </map>
   <img src="class_hierarchy_for_clientredi.gif" alt='' usemap="#class_hierarchy_for_clientredi" ismap="ismap" class="graph-without-title" />
 </center>
@@ -73,31 +73,6 @@
 
 </pre>
 
-<!-- ==================== NESTED CLASSES ==================== -->
-<a name="section-NestedClasses"></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">Nested Classes</span></td>
-        <td align="right" valign="top"
-         ><span class="options">[<a href="#section-NestedClasses"
-         class="privatelink" onclick="toggle_private();"
-         >hide private</a>]</span></td>
-      </tr>
-    </table>
-  </td>
-</tr>
-  <tr>
-    <td colspan="2" class="summary">
-    <p class="indent-wrapped-lines"><b>Inherited from <code>BaseHTTPServer.BaseHTTPRequestHandler</code></b>:
-      <code><a href="mimetools.Message-class.html">MessageClass</a></code>
-      </p>
-    </td>
-  </tr>
-</table>
 <!-- ==================== INSTANCE METHODS ==================== -->
 <a name="section-InstanceMethods"></a>
 <table class="summary" border="1" cellpadding="3"
@@ -198,6 +173,7 @@
   <tr>
     <td colspan="2" class="summary">
     <p class="indent-wrapped-lines"><b>Inherited from <code>BaseHTTPServer.BaseHTTPRequestHandler</code></b>:
+      <code>MessageClass</code>,
       <code>default_request_version</code>,
       <code>error_content_type</code>,
       <code>error_message_format</code>,
@@ -310,7 +286,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.tools.ClientRedirectServer-class.html b/docs/epy/oauth2client.tools.ClientRedirectServer-class.html
index 1218cdd..734468a 100644
--- a/docs/epy/oauth2client.tools.ClientRedirectServer-class.html
+++ b/docs/epy/oauth2client.tools.ClientRedirectServer-class.html
@@ -56,10 +56,10 @@
 <h1 class="epydoc">Class ClientRedirectServer</h1><p class="nomargin-top"><span class="codelink"><a href="oauth2client.tools-pysrc.html#ClientRedirectServer">source&nbsp;code</a></span></p>
 <center>
 <center>  <map id="class_hierarchy_for_clientredi_2" name="class_hierarchy_for_clientredi_2">
-<area shape="rect" href="javascript:void(0);" title="BaseHTTPServer.HTTPServer" alt="" coords="5,117,197,144"/>
-<area shape="rect" href="oauth2client.tools.ClientRedirectServer-class.html" title="ClientRedirectServer" alt="" coords="32,173,171,200"/>
-<area shape="rect" href="javascript:void(0);" title="SocketServer.BaseServer" alt="" coords="17,5,185,32"/>
-<area shape="rect" href="javascript:void(0);" title="SocketServer.TCPServer" alt="" coords="20,61,183,88"/>
+<area shape="rect" href="javascript:void(0);" title="BaseHTTPServer.HTTPServer" alt="" coords="5,5,197,32"/>
+<area shape="rect" href="javascript:void(0);" title="SocketServer.BaseServer" alt="" coords="221,5,389,32"/>
+<area shape="rect" href="javascript:void(0);" title="SocketServer.TCPServer" alt="" coords="413,5,576,32"/>
+<area shape="rect" href="oauth2client.tools.ClientRedirectServer-class.html" title="ClientRedirectServer" alt="" coords="600,5,739,32"/>
 </map>
   <img src="class_hierarchy_for_clientredi_2.gif" alt='' usemap="#class_hierarchy_for_clientredi_2" ismap="ismap" class="graph-without-title" />
 </center>
@@ -140,7 +140,7 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="query_params"></a><span class="summary-name">query_params</span> = <code title="{}"><code class="variable-group">{</code><code class="variable-group">}</code></code>
+        <a name="query_params"></a><span class="summary-name">query_params</span> = <code title="{}">{}</code>
     </td>
   </tr>
   <tr>
@@ -182,7 +182,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.util-module.html b/docs/epy/oauth2client.util-module.html
index 7948b4f..b07657d 100644
--- a/docs/epy/oauth2client.util-module.html
+++ b/docs/epy/oauth2client.util-module.html
@@ -131,13 +131,6 @@
         <a name="FLAGS"></a><span class="summary-name">FLAGS</span> = <code title="gflags.FLAGS">gflags.FLAGS</code>
     </td>
   </tr>
-<tr class="private">
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
-    </td>
-  </tr>
 </table>
 <!-- ==================== FUNCTION DETAILS ==================== -->
 <a name="section-FunctionDetails"></a>
@@ -266,7 +259,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.util-pysrc.html b/docs/epy/oauth2client.util-pysrc.html
index 61b23eb..eb7e562 100644
--- a/docs/epy/oauth2client.util-pysrc.html
+++ b/docs/epy/oauth2client.util-pysrc.html
@@ -232,7 +232,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:47 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:17 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.xsrfutil-module.html b/docs/epy/oauth2client.xsrfutil-module.html
index c255c76..7f878ab 100644
--- a/docs/epy/oauth2client.xsrfutil-module.html
+++ b/docs/epy/oauth2client.xsrfutil-module.html
@@ -65,7 +65,66 @@
           &quot;Joe Gregorio&quot; &lt;jcgregorio@google.com&gt;
         </dd>
       </dl>
-</div><!-- ==================== VARIABLES ==================== -->
+</div><!-- ==================== FUNCTIONS ==================== -->
+<a name="section-Functions"></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">Functions</span></td>
+        <td align="right" valign="top"
+         ><span class="options">[<a href="#section-Functions"
+         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 href="oauth2client.xsrfutil-module.html#generate_token" class="summary-sig-name">generate_token</a>(<span class="summary-sig-arg">key</span>,
+        <span class="summary-sig-arg">user_id</span>,
+        <span class="summary-sig-arg">action_id</span>=<span class="summary-sig-default">&quot;&quot;</span>,
+        <span class="summary-sig-arg">when</span>=<span class="summary-sig-default">None</span>)</span><br />
+      Generates a URL-safe token for the given user, action, time tuple.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="oauth2client.xsrfutil-pysrc.html#generate_token">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="oauth2client.xsrfutil-module.html#validate_token" class="summary-sig-name">validate_token</a>(<span class="summary-sig-arg">key</span>,
+        <span class="summary-sig-arg">token</span>,
+        <span class="summary-sig-arg">user_id</span>,
+        <span class="summary-sig-arg">action_id</span>=<span class="summary-sig-default">&quot;&quot;</span>,
+        <span class="summary-sig-arg">current_time</span>=<span class="summary-sig-default">None</span>)</span><br />
+      Validates that the given token authorizes the user for the action.</td>
+          <td align="right" valign="top">
+            <span class="codelink"><a href="oauth2client.xsrfutil-pysrc.html#validate_token">source&nbsp;code</a></span>
+            
+          </td>
+        </tr>
+      </table>
+      
+    </td>
+  </tr>
+</table>
+<!-- ==================== VARIABLES ==================== -->
 <a name="section-Variables"></a>
 <table class="summary" border="1" cellpadding="3"
        cellspacing="0" width="100%" bgcolor="white">
@@ -86,24 +145,120 @@
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="DELIMITER"></a><span class="summary-name">DELIMITER</span> = <code title="':'"><code class="variable-quote">'</code><code class="variable-string">:</code><code class="variable-quote">'</code></code>
+        <a name="DELIMITER"></a><span class="summary-name">DELIMITER</span> = <code title="':'">':'</code>
     </td>
   </tr>
 <tr>
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="DEFAULT_TIMEOUT_SECS"></a><span class="summary-name">DEFAULT_TIMEOUT_SECS</span> = <code title="3600">3600</code>
-    </td>
-  </tr>
-<tr>
-    <td width="15%" align="right" valign="top" class="summary">
-      <span class="summary-type">&nbsp;</span>
-    </td><td class="summary">
-        <a name="__package__"></a><span class="summary-name">__package__</span> = <code title="'oauth2client'"><code class="variable-quote">'</code><code class="variable-string">oauth2client</code><code class="variable-quote">'</code></code>
+        <a name="DEFAULT_TIMEOUT_SECS"></a><span class="summary-name">DEFAULT_TIMEOUT_SECS</span> = <code title="1* 60* 60">1* 60* 60</code>
     </td>
   </tr>
 </table>
+<!-- ==================== FUNCTION DETAILS ==================== -->
+<a name="section-FunctionDetails"></a>
+<table class="details" 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">Function Details</span></td>
+        <td align="right" valign="top"
+         ><span class="options">[<a href="#section-FunctionDetails"
+         class="privatelink" onclick="toggle_private();"
+         >hide private</a>]</span></td>
+      </tr>
+    </table>
+  </td>
+</tr>
+</table>
+<a name="generate_token"></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">generate_token</span>(<span class="sig-arg">key</span>,
+        <span class="sig-arg">user_id</span>,
+        <span class="sig-arg">action_id</span>=<span class="sig-default">&quot;&quot;</span>,
+        <span class="sig-arg">when</span>=<span class="sig-default">None</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="oauth2client.xsrfutil-pysrc.html#generate_token">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+Generates a URL-safe token for the given user, action, time tuple.
+
+Args:
+  key: secret key to use.
+  user_id: the user ID of the authenticated user.
+  action_id: a string identifier of the action they requested
+    authorization for.
+  when: the time in seconds since the epoch at which the user was
+    authorized for this action. If not set the current time is used.
+
+Returns:
+  A string XSRF protection token.
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@util.positional(2)</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
+<a name="validate_token"></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">validate_token</span>(<span class="sig-arg">key</span>,
+        <span class="sig-arg">token</span>,
+        <span class="sig-arg">user_id</span>,
+        <span class="sig-arg">action_id</span>=<span class="sig-default">&quot;&quot;</span>,
+        <span class="sig-arg">current_time</span>=<span class="sig-default">None</span>)</span>
+  </h3>
+  </td><td align="right" valign="top"
+    ><span class="codelink"><a href="oauth2client.xsrfutil-pysrc.html#validate_token">source&nbsp;code</a></span>&nbsp;
+    </td>
+  </tr></table>
+  
+  <pre class="literalblock">
+Validates that the given token authorizes the user for the action.
+
+Tokens are invalid if the time of issue is too old or if the token
+does not match what generateToken outputs (i.e. the token was forged).
+
+Args:
+  key: secret key to use.
+  token: a string of the token generated by generateToken.
+  user_id: the user ID of the authenticated user.
+  action_id: a string identifier of the action they requested
+    authorization for.
+
+Returns:
+  A boolean - True if the user is authorized for the action, False
+  otherwise.
+
+</pre>
+  <dl class="fields">
+    <dt>Decorators:</dt>
+    <dd><ul class="nomargin-top">
+        <li><code>@util.positional(3)</code></li>
+    </ul></dd>
+  </dl>
+</td></tr></table>
+</div>
+<br />
 <!-- ==================== NAVIGATION BAR ==================== -->
 <table class="navbar" border="0" width="100%" cellpadding="0"
        bgcolor="#a0c0ff" cellspacing="0">
@@ -127,7 +282,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:42 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:11 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/oauth2client.xsrfutil-pysrc.html b/docs/epy/oauth2client.xsrfutil-pysrc.html
index 573ea91..b93db62 100644
--- a/docs/epy/oauth2client.xsrfutil-pysrc.html
+++ b/docs/epy/oauth2client.xsrfutil-pysrc.html
@@ -153,7 +153,7 @@
 <a name="L98"></a><tt class="py-lineno"> 98</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">False</tt> </tt>
 <a name="L99"></a><tt class="py-lineno"> 99</tt>  <tt class="py-line"> </tt>
 <a name="L100"></a><tt class="py-lineno">100</tt>  <tt class="py-line">  <tt class="py-comment"># The given token should match the generated one with the same time.</tt> </tt>
-<a name="L101"></a><tt class="py-lineno">101</tt>  <tt class="py-line">  <tt class="py-name">expected_token</tt> <tt class="py-op">=</tt> <tt class="py-name">generate_token</tt><tt class="py-op">(</tt><tt class="py-name">key</tt><tt class="py-op">,</tt> <tt class="py-name">user_id</tt><tt class="py-op">,</tt> <tt class="py-name">action_id</tt><tt class="py-op">=</tt><tt class="py-name">action_id</tt><tt class="py-op">,</tt> </tt>
+<a name="L101"></a><tt class="py-lineno">101</tt>  <tt class="py-line">  <tt class="py-name">expected_token</tt> <tt class="py-op">=</tt> <tt id="link-11" class="py-name" targets="Function oauth2client.xsrfutil.generate_token()=oauth2client.xsrfutil-module.html#generate_token"><a title="oauth2client.xsrfutil.generate_token" class="py-name" href="#" onclick="return doclink('link-11', 'generate_token', 'link-11');">generate_token</a></tt><tt class="py-op">(</tt><tt class="py-name">key</tt><tt class="py-op">,</tt> <tt class="py-name">user_id</tt><tt class="py-op">,</tt> <tt class="py-name">action_id</tt><tt class="py-op">=</tt><tt class="py-name">action_id</tt><tt class="py-op">,</tt> </tt>
 <a name="L102"></a><tt class="py-lineno">102</tt>  <tt class="py-line">                                  <tt class="py-name">when</tt><tt class="py-op">=</tt><tt class="py-name">token_time</tt><tt class="py-op">)</tt> </tt>
 <a name="L103"></a><tt class="py-lineno">103</tt>  <tt class="py-line">  <tt class="py-keyword">if</tt> <tt class="py-name">token</tt> <tt class="py-op">!=</tt> <tt class="py-name">expected_token</tt><tt class="py-op">:</tt> </tt>
 <a name="L104"></a><tt class="py-lineno">104</tt>  <tt class="py-line">    <tt class="py-keyword">return</tt> <tt class="py-name">False</tt> </tt>
@@ -189,7 +189,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Thu Aug 30 07:12:48 2012
+    Generated by Epydoc 3.0.1 on Thu Sep  6 13:36:16 2012
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"
diff --git a/docs/epy/redirect.html b/docs/epy/redirect.html
index e7c22da..78719ba 100644
--- a/docs/epy/redirect.html
+++ b/docs/epy/redirect.html
@@ -7,7 +7,7 @@
 <body>
 <script type="text/javascript">
 <!--
-var pages = ["oauth2client.locked_file.CredentialsFileSymbolicLinkError-c", "oauth2client.appengine.OAuth2DecoratorFromClientSecrets-c", "oauth2client.multistore_file.NewerCredentialStoreError-c", "oauth2client.clientsecrets.InvalidClientSecretsError-c", "oauth2client.file.CredentialsFileSymbolicLinkError-c", "oauth2client.client.SignedJwtAssertionCredentials-c", "oauth2client.client.UnknownClientSecretsFlowError-c", "oauth2client.multistore_file._MultiStore._Storage-c", "django.db.models.fields.subclassing.SubfieldBase-c", "oauth2client.appengine.InvalidClientSecretsError-c", "oauth2client.client.AccessTokenCredentialsError-c", "oauth2client.locked_file.AlreadyLockedException-c", "oauth2client.appengine.AppAssertionCredentials-c", "oauth2client.appengine.InvalidXsrfTokenError-c", "oauth2client.client.AccessTokenRefreshError-c", "apiclient.errors.UnacceptableMimeTypeError-c", "oauth2client.appengine.CredentialsProperty-c", "oauth2client.client.AccessTokenCredentials-c", "apiclient.errors.UnknownApiNameOrVersion-c", "oauth2client.appengine.SiteXsrfSecretKey-c", "oauth2client.client.AssertionCredentials-c", "oauth2client.django_orm.CredentialsField-c", "oauth2client.gce.AppAssertionCredentials-c", "oauth2client.multistore_file._MultiStore-c", "oauth2client.tools.ClientRedirectHandler-c", "google.appengine.ext.db.PropertiedClass-c", "oauth2client.appengine.CredentialsModel-c", "oauth2client.appengine.StorageByKeyName-c", "oauth2client.client.OAuth2WebServerFlow-c", "oauth2client.client.VerifyJwtTokenError-c", "oauth2client.tools.ClientRedirectServer-c", "apiclient.errors.InvalidChunkSizeError-c", "apiclient.errors.UnexpectedMethodError-c", "oauth2client.appengine.OAuth2Decorator-c", "apiclient.errors.MediaUploadSizeError-c", "apiclient.errors.ResumableUploadError-c", "oauth2client.client.FlowExchangeError-c", "oauth2client.client.OAuth2Credentials-c", "oauth2client.locked_file._FcntlOpener-c", "oauth2client.locked_file._PosixOpener-c", "apiclient.errors.UnexpectedBodyError-c", "apiclient.http.MediaDownloadProgress-c", "oauth2client.keyring_storage.Storage-c", "apiclient.model.ProtocolBufferModel-c", "oauth2client.appengine.FlowProperty-c", "oauth2client.crypt.AppIdentityError-c", "oauth2client.locked_file.LockedFile-c", "apiclient.http.MediaInMemoryUpload-c", "apiclient.http.MediaIoBaseDownload-c", "apiclient.http.MediaUploadProgress-c", "oauth2client.multistore_file.Error-c", "apiclient.errors.InvalidJsonError-c", "apiclient.http.RequestMockBuilder-c", "oauth2client.django_orm.FlowField-c", "apiclient.errors.UnknownLinkType-c", "apiclient.http.MediaIoBaseUpload-c", "apiclient.schema._SchemaToStruct-c", "oauth2client.clientsecrets.Error-c", "oauth2client.locked_file._Opener-c", "apiclient.http.BatchHttpRequest-c", "apiclient.http.HttpMockSequence-c", "oauth2client.client.Credentials-c", "oauth2client.client.MemoryCache-c", "oauth2client.django_orm.Storage-c", "apiclient.http.HttpRequestMock-c", "apiclient.http.MediaFileUpload-c", "oauth2client.keyring_storage-m", "oauth2client.multistore_file-m", "apiclient.errors.BatchError-c", "apiclient.http._StreamSlice-c", "oauth2client.client.Storage-c", "oauth2client.crypt.Verifier-c", "oauth2client.clientsecrets-m", "apiclient.errors.HttpError-c", "apiclient.http.HttpRequest-c", "apiclient.http.MediaUpload-c", "apiclient.model.MediaModel-c", "apiclient.model.BaseModel-c", "apiclient.model.JsonModel-c", "oauth2client.client.Error-c", "oauth2client.crypt.Signer-c", "oauth2client.file.Storage-c", "oauth2client.locked_file-m", "apiclient.model.RawModel-c", "apiclient.schema.Schemas-c", "oauth2client.client.Flow-c", "oauth2client.django_orm-m", "apiclient.http.HttpMock-c", "oauth2client.appengine-m", "apiclient.errors.Error-c", "oauth2client.xsrfutil-m", "apiclient.model.Model-c", "oauth2client.anyjson-m", "apiclient.discovery-m", "apiclient.mimeparse-m", "oauth2client.client-m", "oauth2client.crypt-m", "oauth2client.tools-m", "oauth2client.file-m", "oauth2client.util-m", "mimetools.Message-c", "apiclient.errors-m", "apiclient.schema-m", "oauth2client.gce-m", "apiclient.model-m", "apiclient.http-m", "apiclient.ext-m", "oauth2client-m", "apiclient-m"];
+var pages = ["oauth2client.locked_file.CredentialsFileSymbolicLinkError-c", "oauth2client.appengine.OAuth2DecoratorFromClientSecrets-c", "oauth2client.multistore_file.NewerCredentialStoreError-c", "oauth2client.clientsecrets.InvalidClientSecretsError-c", "oauth2client.file.CredentialsFileSymbolicLinkError-c", "oauth2client.client.SignedJwtAssertionCredentials-c", "oauth2client.client.UnknownClientSecretsFlowError-c", "oauth2client.multistore_file._MultiStore._Storage-c", "oauth2client.appengine.InvalidClientSecretsError-c", "oauth2client.client.AccessTokenCredentialsError-c", "oauth2client.locked_file.AlreadyLockedException-c", "oauth2client.appengine.AppAssertionCredentials-c", "oauth2client.appengine.InvalidXsrfTokenError-c", "oauth2client.client.AccessTokenRefreshError-c", "apiclient.errors.UnacceptableMimeTypeError-c", "oauth2client.appengine.CredentialsProperty-c", "oauth2client.client.AccessTokenCredentials-c", "apiclient.errors.UnknownApiNameOrVersion-c", "oauth2client.appengine.SiteXsrfSecretKey-c", "oauth2client.client.AssertionCredentials-c", "oauth2client.django_orm.CredentialsField-c", "oauth2client.gce.AppAssertionCredentials-c", "oauth2client.multistore_file._MultiStore-c", "oauth2client.tools.ClientRedirectHandler-c", "google.appengine.ext.db.PropertiedClass-c", "oauth2client.appengine.CredentialsModel-c", "oauth2client.appengine.StorageByKeyName-c", "oauth2client.client.OAuth2WebServerFlow-c", "oauth2client.client.VerifyJwtTokenError-c", "oauth2client.tools.ClientRedirectServer-c", "apiclient.errors.InvalidChunkSizeError-c", "apiclient.errors.UnexpectedMethodError-c", "oauth2client.appengine.OAuth2Decorator-c", "apiclient.errors.MediaUploadSizeError-c", "apiclient.errors.ResumableUploadError-c", "oauth2client.client.FlowExchangeError-c", "oauth2client.client.OAuth2Credentials-c", "oauth2client.locked_file._PosixOpener-c", "apiclient.errors.UnexpectedBodyError-c", "apiclient.http.MediaDownloadProgress-c", "oauth2client.keyring_storage.Storage-c", "apiclient.model.ProtocolBufferModel-c", "oauth2client.appengine.FlowProperty-c", "oauth2client.crypt.AppIdentityError-c", "oauth2client.locked_file.LockedFile-c", "apiclient.http.MediaInMemoryUpload-c", "apiclient.http.MediaIoBaseDownload-c", "apiclient.http.MediaUploadProgress-c", "oauth2client.multistore_file.Error-c", "apiclient.errors.InvalidJsonError-c", "apiclient.http.RequestMockBuilder-c", "oauth2client.django_orm.FlowField-c", "apiclient.errors.UnknownLinkType-c", "apiclient.http.MediaIoBaseUpload-c", "apiclient.schema._SchemaToStruct-c", "oauth2client.clientsecrets.Error-c", "oauth2client.locked_file._Opener-c", "apiclient.http.BatchHttpRequest-c", "apiclient.http.HttpMockSequence-c", "oauth2client.client.Credentials-c", "oauth2client.client.MemoryCache-c", "oauth2client.django_orm.Storage-c", "apiclient.http.HttpRequestMock-c", "apiclient.http.MediaFileUpload-c", "oauth2client.keyring_storage-m", "oauth2client.multistore_file-m", "apiclient.errors.BatchError-c", "apiclient.http._StreamSlice-c", "oauth2client.client.Storage-c", "oauth2client.crypt.Verifier-c", "oauth2client.clientsecrets-m", "apiclient.errors.HttpError-c", "apiclient.http.HttpRequest-c", "apiclient.http.MediaUpload-c", "apiclient.model.MediaModel-c", "apiclient.model.BaseModel-c", "apiclient.model.JsonModel-c", "oauth2client.client.Error-c", "oauth2client.crypt.Signer-c", "oauth2client.file.Storage-c", "oauth2client.locked_file-m", "apiclient.model.RawModel-c", "apiclient.schema.Schemas-c", "oauth2client.client.Flow-c", "oauth2client.django_orm-m", "apiclient.http.HttpMock-c", "oauth2client.appengine-m", "apiclient.errors.Error-c", "oauth2client.xsrfutil-m", "apiclient.model.Model-c", "oauth2client.anyjson-m", "apiclient.discovery-m", "apiclient.mimeparse-m", "oauth2client.client-m", "oauth2client.crypt-m", "oauth2client.tools-m", "oauth2client.file-m", "oauth2client.util-m", "apiclient.errors-m", "apiclient.schema-m", "oauth2client.gce-m", "apiclient.model-m", "apiclient.http-m", "apiclient.ext-m", "oauth2client-m", "apiclient-m"];
 var dottedName = get_anchor();
 if (dottedName) {
     var target = redirect_url(dottedName);
diff --git a/docs/epy/toc-apiclient-module.html b/docs/epy/toc-apiclient-module.html
index e5fe220..9818af4 100644
--- a/docs/epy/toc-apiclient-module.html
+++ b/docs/epy/toc-apiclient-module.html
@@ -12,9 +12,7 @@
       alink="#204080">
 <h1 class="toc">Module apiclient</h1>
 <hr />
-  <h2 class="toc">Variables</h2>
-    <a target="mainFrame" href="apiclient-module.html#__package__"
-     >__package__</a><br /><hr />
+<hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-apiclient.discovery-module.html b/docs/epy/toc-apiclient.discovery-module.html
index 1692deb..be5b52f 100644
--- a/docs/epy/toc-apiclient.discovery-module.html
+++ b/docs/epy/toc-apiclient.discovery-module.html
@@ -26,39 +26,48 @@
     <a target="mainFrame" href="apiclient.discovery-module.html#_media_size_to_long"
      >_media_size_to_long</a><br />  </div>
     <a target="mainFrame" href="apiclient.discovery-module.html#build"
-     >build</a><br />  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#fix_method_name"
-     >fix_method_name</a><br />  </div>
-    <a target="mainFrame" href="apiclient.discovery-module.html#key2param"
+     >build</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#build_from_document"
+     >build_from_document</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#fix_method_name"
+     >fix_method_name</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#key2param"
      >key2param</a><br />  <h2 class="toc">Variables</h2>
-  <div class="private">
     <a target="mainFrame" href="apiclient.discovery-module.html#DEFAULT_METHOD_DOC"
-     >DEFAULT_METHOD_DOC</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#DISCOVERY_URI"
-     >DISCOVERY_URI</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#MULTIPLIERS"
-     >MULTIPLIERS</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#RESERVED_WORDS"
-     >RESERVED_WORDS</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#STACK_QUERY_PARAMETERS"
-     >STACK_QUERY_PARAMETERS</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#URITEMPLATE"
-     >URITEMPLATE</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#VARNAME"
-     >VARNAME</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#__package__"
-     >__package__</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#logger"
-     >logger</a><br />  </div>
-<hr />
+     >DEFAULT_METHOD_DOC</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#DISCOVERY_URI"
+     >DISCOVERY_URI</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#HttpError"
+     >HttpError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#HttpRequest"
+     >HttpRequest</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#InvalidJsonError"
+     >InvalidJsonError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#JsonModel"
+     >JsonModel</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MIMEMultipart"
+     >MIMEMultipart</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MIMENonMultipart"
+     >MIMENonMultipart</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MULTIPLIERS"
+     >MULTIPLIERS</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaFileUpload"
+     >MediaFileUpload</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaModel"
+     >MediaModel</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaUpload"
+     >MediaUpload</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaUploadSizeError"
+     >MediaUploadSizeError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#RESERVED_WORDS"
+     >RESERVED_WORDS</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#RawModel"
+     >RawModel</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#STACK_QUERY_PARAMETERS"
+     >STACK_QUERY_PARAMETERS</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#Schemas"
+     >Schemas</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#URITEMPLATE"
+     >URITEMPLATE</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#UnacceptableMimeTypeError"
+     >UnacceptableMimeTypeError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#UnknownApiNameOrVersion"
+     >UnknownApiNameOrVersion</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#UnknownLinkType"
+     >UnknownLinkType</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#VARNAME"
+     >VARNAME</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#copy"
+     >copy</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#httplib2"
+     >httplib2</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#logger"
+     >logger</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#logging"
+     >logging</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#mimeparse"
+     >mimeparse</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#mimetypes"
+     >mimetypes</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#os"
+     >os</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#parse_qsl"
+     >parse_qsl</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#positional"
+     >positional</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#random"
+     >random</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#re"
+     >re</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#simplejson"
+     >simplejson</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#uritemplate"
+     >uritemplate</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#urllib"
+     >urllib</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#urlparse"
+     >urlparse</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-apiclient.errors-module.html b/docs/epy/toc-apiclient.errors-module.html
index ac1b273..deff83e 100644
--- a/docs/epy/toc-apiclient.errors-module.html
+++ b/docs/epy/toc-apiclient.errors-module.html
@@ -25,9 +25,7 @@
      >UnexpectedBodyError</a><br />    <a target="mainFrame" href="apiclient.errors.UnexpectedMethodError-class.html"
      >UnexpectedMethodError</a><br />    <a target="mainFrame" href="apiclient.errors.UnknownApiNameOrVersion-class.html"
      >UnknownApiNameOrVersion</a><br />    <a target="mainFrame" href="apiclient.errors.UnknownLinkType-class.html"
-     >UnknownLinkType</a><br />  <h2 class="toc">Variables</h2>
-    <a target="mainFrame" href="apiclient.errors-module.html#__package__"
-     >__package__</a><br /><hr />
+     >UnknownLinkType</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-apiclient.ext-module.html b/docs/epy/toc-apiclient.ext-module.html
index 9455a1f..dfe92d0 100644
--- a/docs/epy/toc-apiclient.ext-module.html
+++ b/docs/epy/toc-apiclient.ext-module.html
@@ -12,9 +12,7 @@
       alink="#204080">
 <h1 class="toc">Module ext</h1>
 <hr />
-  <h2 class="toc">Variables</h2>
-    <a target="mainFrame" href="apiclient.ext-module.html#__package__"
-     >__package__</a><br /><hr />
+<hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-apiclient.http-module.html b/docs/epy/toc-apiclient.http-module.html
index 7a49920..0ab4e14 100644
--- a/docs/epy/toc-apiclient.http-module.html
+++ b/docs/epy/toc-apiclient.http-module.html
@@ -35,8 +35,7 @@
      >tunnel_patch</a><br />  <h2 class="toc">Variables</h2>
     <a target="mainFrame" href="apiclient.http-module.html#DEFAULT_CHUNK_SIZE"
      >DEFAULT_CHUNK_SIZE</a><br />    <a target="mainFrame" href="apiclient.http-module.html#MAX_URI_LENGTH"
-     >MAX_URI_LENGTH</a><br />    <a target="mainFrame" href="apiclient.http-module.html#__package__"
-     >__package__</a><br /><hr />
+     >MAX_URI_LENGTH</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-apiclient.mimeparse-module.html b/docs/epy/toc-apiclient.mimeparse-module.html
index 3fd526a..ee4c6cc 100644
--- a/docs/epy/toc-apiclient.mimeparse-module.html
+++ b/docs/epy/toc-apiclient.mimeparse-module.html
@@ -25,8 +25,7 @@
      >quality_parsed</a><br />  <h2 class="toc">Variables</h2>
     <a target="mainFrame" href="apiclient.mimeparse-module.html#__credits__"
      >__credits__</a><br />    <a target="mainFrame" href="apiclient.mimeparse-module.html#__email__"
-     >__email__</a><br />    <a target="mainFrame" href="apiclient.mimeparse-module.html#__package__"
-     >__package__</a><br /><hr />
+     >__email__</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-apiclient.model-module.html b/docs/epy/toc-apiclient.model-module.html
index 7d9decf..6f9d79d 100644
--- a/docs/epy/toc-apiclient.model-module.html
+++ b/docs/epy/toc-apiclient.model-module.html
@@ -26,8 +26,7 @@
     <a target="mainFrame" href="apiclient.model-module.html#makepatch"
      >makepatch</a><br />  <h2 class="toc">Variables</h2>
     <a target="mainFrame" href="apiclient.model-module.html#FLAGS"
-     >FLAGS</a><br />    <a target="mainFrame" href="apiclient.model-module.html#__package__"
-     >__package__</a><br /><hr />
+     >FLAGS</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-apiclient.schema-module.html b/docs/epy/toc-apiclient.schema-module.html
index deb0fb8..60ee3e5 100644
--- a/docs/epy/toc-apiclient.schema-module.html
+++ b/docs/epy/toc-apiclient.schema-module.html
@@ -17,9 +17,7 @@
      >Schemas</a><br />  <div class="private">
     <a target="mainFrame" href="apiclient.schema._SchemaToStruct-class.html"
      >_SchemaToStruct</a><br />  </div>
-  <h2 class="toc">Variables</h2>
-    <a target="mainFrame" href="apiclient.schema-module.html#__package__"
-     >__package__</a><br /><hr />
+<hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-everything.html b/docs/epy/toc-everything.html
index 61deda7..bf92d0b 100644
--- a/docs/epy/toc-everything.html
+++ b/docs/epy/toc-everything.html
@@ -51,10 +51,8 @@
      >apiclient.schema.Schemas</a><br />  <div class="private">
     <a target="mainFrame" href="apiclient.schema._SchemaToStruct-class.html"
      >apiclient.schema._SchemaToStruct</a><br />  </div>
-    <a target="mainFrame" href="django.db.models.fields.subclassing.SubfieldBase-class.html"
-     >django.db.models.fields.subclassing.SubfieldBase</a><br />    <a target="mainFrame" href="google.appengine.ext.db.PropertiedClass-class.html"
-     >google.appengine.ext.db.PropertiedClass</a><br />    <a target="mainFrame" href="mimetools.Message-class.html"
-     >mimetools.Message</a><br />    <a target="mainFrame" href="oauth2client.appengine.AppAssertionCredentials-class.html"
+    <a target="mainFrame" href="google.appengine.ext.db.PropertiedClass-class.html"
+     >google.appengine.ext.db.PropertiedClass</a><br />    <a target="mainFrame" href="oauth2client.appengine.AppAssertionCredentials-class.html"
      >oauth2client.appengine.AppAssertionCredentials</a><br />    <a target="mainFrame" href="oauth2client.appengine.CredentialsModel-class.html"
      >oauth2client.appengine.CredentialsModel</a><br />    <a target="mainFrame" href="oauth2client.appengine.CredentialsProperty-class.html"
      >oauth2client.appengine.CredentialsProperty</a><br />    <a target="mainFrame" href="oauth2client.appengine.FlowProperty-class.html"
@@ -95,9 +93,6 @@
      >oauth2client.locked_file.AlreadyLockedException</a><br />    <a target="mainFrame" href="oauth2client.locked_file.CredentialsFileSymbolicLinkError-class.html"
      >oauth2client.locked_file.CredentialsFileSymbolicLinkError</a><br />    <a target="mainFrame" href="oauth2client.locked_file.LockedFile-class.html"
      >oauth2client.locked_file.LockedFile</a><br />  <div class="private">
-    <a target="mainFrame" href="oauth2client.locked_file._FcntlOpener-class.html"
-     >oauth2client.locked_file._FcntlOpener</a><br />  </div>
-  <div class="private">
     <a target="mainFrame" href="oauth2client.locked_file._Opener-class.html"
      >oauth2client.locked_file._Opener</a><br />  </div>
   <div class="private">
@@ -131,10 +126,9 @@
     <a target="mainFrame" href="apiclient.discovery-module.html#_media_size_to_long"
      >apiclient.discovery._media_size_to_long</a><br />  </div>
     <a target="mainFrame" href="apiclient.discovery-module.html#build"
-     >apiclient.discovery.build</a><br />  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#fix_method_name"
-     >apiclient.discovery.fix_method_name</a><br />  </div>
-    <a target="mainFrame" href="apiclient.discovery-module.html#key2param"
+     >apiclient.discovery.build</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#build_from_document"
+     >apiclient.discovery.build_from_document</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#fix_method_name"
+     >apiclient.discovery.fix_method_name</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#key2param"
      >apiclient.discovery.key2param</a><br />    <a target="mainFrame" href="apiclient.http-module.html#set_user_agent"
      >apiclient.http.set_user_agent</a><br />    <a target="mainFrame" href="apiclient.http-module.html#tunnel_patch"
      >apiclient.http.tunnel_patch</a><br />  <div class="private">
@@ -162,7 +156,8 @@
   <div class="private">
     <a target="mainFrame" href="oauth2client.appengine-module.html#_safe_html"
      >oauth2client.appengine._safe_html</a><br />  </div>
-    <a target="mainFrame" href="oauth2client.appengine-module.html#xsrf_secret_key"
+    <a target="mainFrame" href="oauth2client.appengine-module.html#oauth2decorator_from_clientsecrets"
+     >oauth2client.appengine.oauth2decorator_from_clientsecrets</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#xsrf_secret_key"
      >oauth2client.appengine.xsrf_secret_key</a><br />  <div class="private">
     <a target="mainFrame" href="oauth2client.client-module.html#_abstract"
      >oauth2client.client._abstract</a><br />  </div>
@@ -175,7 +170,11 @@
   <div class="private">
     <a target="mainFrame" href="oauth2client.client-module.html#_urlsafe_b64decode"
      >oauth2client.client._urlsafe_b64decode</a><br />  </div>
-  <div class="private">
+    <a target="mainFrame" href="oauth2client.client-module.html#credentials_from_clientsecrets_and_code"
+     >oauth2client.client.credentials_from_clientsecrets_and_code</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#credentials_from_code"
+     >oauth2client.client.credentials_from_code</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#flow_from_clientsecrets"
+     >oauth2client.client.flow_from_clientsecrets</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#verify_id_token"
+     >oauth2client.client.verify_id_token</a><br />  <div class="private">
     <a target="mainFrame" href="oauth2client.clientsecrets-module.html#_loadfile"
      >oauth2client.clientsecrets._loadfile</a><br />  </div>
   <div class="private">
@@ -196,85 +195,82 @@
     <a target="mainFrame" href="oauth2client.crypt-module.html#make_signed_jwt"
      >oauth2client.crypt.make_signed_jwt</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#verify_signed_jwt_with_certs"
      >oauth2client.crypt.verify_signed_jwt_with_certs</a><br />    <a target="mainFrame" href="oauth2client.locked_file-module.html#validate_file"
-     >oauth2client.locked_file.validate_file</a><br />    <a target="mainFrame" href="oauth2client.tools-module.html#run"
+     >oauth2client.locked_file.validate_file</a><br />    <a target="mainFrame" href="oauth2client.multistore_file-module.html#get_credential_storage"
+     >oauth2client.multistore_file.get_credential_storage</a><br />    <a target="mainFrame" href="oauth2client.tools-module.html#run"
      >oauth2client.tools.run</a><br />    <a target="mainFrame" href="oauth2client.util-module.html#positional"
-     >oauth2client.util.positional</a><br />  <h2 class="toc">All Variables</h2>
-    <a target="mainFrame" href="apiclient-module.html#__package__"
-     >apiclient.__package__</a><br />  <div class="private">
+     >oauth2client.util.positional</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#generate_token"
+     >oauth2client.xsrfutil.generate_token</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#validate_token"
+     >oauth2client.xsrfutil.validate_token</a><br />  <h2 class="toc">All Variables</h2>
     <a target="mainFrame" href="apiclient.discovery-module.html#DEFAULT_METHOD_DOC"
-     >apiclient.discovery.DEFAULT_METHOD_DOC</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#DISCOVERY_URI"
-     >apiclient.discovery.DISCOVERY_URI</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#MULTIPLIERS"
-     >apiclient.discovery.MULTIPLIERS</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#RESERVED_WORDS"
-     >apiclient.discovery.RESERVED_WORDS</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#STACK_QUERY_PARAMETERS"
-     >apiclient.discovery.STACK_QUERY_PARAMETERS</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#URITEMPLATE"
-     >apiclient.discovery.URITEMPLATE</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#VARNAME"
-     >apiclient.discovery.VARNAME</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#__package__"
-     >apiclient.discovery.__package__</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="apiclient.discovery-module.html#logger"
-     >apiclient.discovery.logger</a><br />  </div>
-    <a target="mainFrame" href="apiclient.errors-module.html#__package__"
-     >apiclient.errors.__package__</a><br />    <a target="mainFrame" href="apiclient.ext-module.html#__package__"
-     >apiclient.ext.__package__</a><br />    <a target="mainFrame" href="apiclient.http-module.html#DEFAULT_CHUNK_SIZE"
+     >apiclient.discovery.DEFAULT_METHOD_DOC</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#DISCOVERY_URI"
+     >apiclient.discovery.DISCOVERY_URI</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#HttpError"
+     >apiclient.discovery.HttpError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#HttpRequest"
+     >apiclient.discovery.HttpRequest</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#InvalidJsonError"
+     >apiclient.discovery.InvalidJsonError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#JsonModel"
+     >apiclient.discovery.JsonModel</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MIMEMultipart"
+     >apiclient.discovery.MIMEMultipart</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MIMENonMultipart"
+     >apiclient.discovery.MIMENonMultipart</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MULTIPLIERS"
+     >apiclient.discovery.MULTIPLIERS</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaFileUpload"
+     >apiclient.discovery.MediaFileUpload</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaModel"
+     >apiclient.discovery.MediaModel</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaUpload"
+     >apiclient.discovery.MediaUpload</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#MediaUploadSizeError"
+     >apiclient.discovery.MediaUploadSizeError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#RESERVED_WORDS"
+     >apiclient.discovery.RESERVED_WORDS</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#RawModel"
+     >apiclient.discovery.RawModel</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#STACK_QUERY_PARAMETERS"
+     >apiclient.discovery.STACK_QUERY_PARAMETERS</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#Schemas"
+     >apiclient.discovery.Schemas</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#URITEMPLATE"
+     >apiclient.discovery.URITEMPLATE</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#UnacceptableMimeTypeError"
+     >apiclient.discovery.UnacceptableMimeTypeError</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#UnknownApiNameOrVersion"
+     >apiclient.discovery.UnknownApiNameOrVersion</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#UnknownLinkType"
+     >apiclient.discovery.UnknownLinkType</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#VARNAME"
+     >apiclient.discovery.VARNAME</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#copy"
+     >apiclient.discovery.copy</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#httplib2"
+     >apiclient.discovery.httplib2</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#logger"
+     >apiclient.discovery.logger</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#logging"
+     >apiclient.discovery.logging</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#mimeparse"
+     >apiclient.discovery.mimeparse</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#mimetypes"
+     >apiclient.discovery.mimetypes</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#os"
+     >apiclient.discovery.os</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#parse_qsl"
+     >apiclient.discovery.parse_qsl</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#positional"
+     >apiclient.discovery.positional</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#random"
+     >apiclient.discovery.random</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#re"
+     >apiclient.discovery.re</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#simplejson"
+     >apiclient.discovery.simplejson</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#uritemplate"
+     >apiclient.discovery.uritemplate</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#urllib"
+     >apiclient.discovery.urllib</a><br />    <a target="mainFrame" href="apiclient.discovery-module.html#urlparse"
+     >apiclient.discovery.urlparse</a><br />    <a target="mainFrame" href="apiclient.http-module.html#DEFAULT_CHUNK_SIZE"
      >apiclient.http.DEFAULT_CHUNK_SIZE</a><br />    <a target="mainFrame" href="apiclient.http-module.html#MAX_URI_LENGTH"
-     >apiclient.http.MAX_URI_LENGTH</a><br />    <a target="mainFrame" href="apiclient.http-module.html#__package__"
-     >apiclient.http.__package__</a><br />    <a target="mainFrame" href="apiclient.mimeparse-module.html#__credits__"
+     >apiclient.http.MAX_URI_LENGTH</a><br />    <a target="mainFrame" href="apiclient.mimeparse-module.html#__credits__"
      >apiclient.mimeparse.__credits__</a><br />    <a target="mainFrame" href="apiclient.mimeparse-module.html#__email__"
-     >apiclient.mimeparse.__email__</a><br />    <a target="mainFrame" href="apiclient.mimeparse-module.html#__package__"
-     >apiclient.mimeparse.__package__</a><br />    <a target="mainFrame" href="apiclient.model-module.html#FLAGS"
-     >apiclient.model.FLAGS</a><br />    <a target="mainFrame" href="apiclient.model-module.html#__package__"
-     >apiclient.model.__package__</a><br />    <a target="mainFrame" href="apiclient.schema-module.html#__package__"
-     >apiclient.schema.__package__</a><br />    <a target="mainFrame" href="oauth2client-module.html#__package__"
-     >oauth2client.__package__</a><br />    <a target="mainFrame" href="oauth2client.anyjson-module.html#__package__"
-     >oauth2client.anyjson.__package__</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#OAUTH2CLIENT_NAMESPACE"
+     >apiclient.mimeparse.__email__</a><br />    <a target="mainFrame" href="apiclient.model-module.html#FLAGS"
+     >apiclient.model.FLAGS</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#OAUTH2CLIENT_NAMESPACE"
      >oauth2client.appengine.OAUTH2CLIENT_NAMESPACE</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#XSRF_MEMCACHE_ID"
-     >oauth2client.appengine.XSRF_MEMCACHE_ID</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#__package__"
-     >oauth2client.appengine.__package__</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#logger"
+     >oauth2client.appengine.XSRF_MEMCACHE_ID</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#logger"
      >oauth2client.appengine.logger</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#EXPIRY_FORMAT"
      >oauth2client.client.EXPIRY_FORMAT</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#HAS_OPENSSL"
      >oauth2client.client.HAS_OPENSSL</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#ID_TOKEN_VERIFICATON_CERTS"
      >oauth2client.client.ID_TOKEN_VERIFICATON_CERTS</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#OOB_CALLBACK_URN"
-     >oauth2client.client.OOB_CALLBACK_URN</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#__package__"
-     >oauth2client.client.__package__</a><br />  <div class="private">
+     >oauth2client.client.OOB_CALLBACK_URN</a><br />  <div class="private">
     <a target="mainFrame" href="oauth2client.client-module.html#_cached_http"
      >oauth2client.client._cached_http</a><br />  </div>
     <a target="mainFrame" href="oauth2client.client-module.html#logger"
      >oauth2client.client.logger</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#TYPE_INSTALLED"
      >oauth2client.clientsecrets.TYPE_INSTALLED</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#TYPE_WEB"
      >oauth2client.clientsecrets.TYPE_WEB</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#VALID_CLIENT"
-     >oauth2client.clientsecrets.VALID_CLIENT</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#__package__"
-     >oauth2client.clientsecrets.__package__</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#AUTH_TOKEN_LIFETIME_SECS"
+     >oauth2client.clientsecrets.VALID_CLIENT</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#AUTH_TOKEN_LIFETIME_SECS"
      >oauth2client.crypt.AUTH_TOKEN_LIFETIME_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#CLOCK_SKEW_SECS"
      >oauth2client.crypt.CLOCK_SKEW_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#MAX_TOKEN_LIFETIME_SECS"
-     >oauth2client.crypt.MAX_TOKEN_LIFETIME_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#__package__"
-     >oauth2client.crypt.__package__</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#logger"
-     >oauth2client.crypt.logger</a><br />    <a target="mainFrame" href="oauth2client.django_orm-module.html#__package__"
-     >oauth2client.django_orm.__package__</a><br />    <a target="mainFrame" href="oauth2client.file-module.html#__package__"
-     >oauth2client.file.__package__</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#META"
-     >oauth2client.gce.META</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#__package__"
-     >oauth2client.gce.__package__</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#logger"
-     >oauth2client.gce.logger</a><br />    <a target="mainFrame" href="oauth2client.keyring_storage-module.html#__package__"
-     >oauth2client.keyring_storage.__package__</a><br />  <div class="private">
+     >oauth2client.crypt.MAX_TOKEN_LIFETIME_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#logger"
+     >oauth2client.crypt.logger</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#META"
+     >oauth2client.gce.META</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#logger"
+     >oauth2client.gce.logger</a><br />  <div class="private">
+    <a target="mainFrame" href="oauth2client.locked_file-module.html#_FcntlOpener"
+     >oauth2client.locked_file._FcntlOpener</a><br />  </div>
+  <div class="private">
     <a target="mainFrame" href="oauth2client.locked_file-module.html#_Win32Opener"
      >oauth2client.locked_file._Win32Opener</a><br />  </div>
-    <a target="mainFrame" href="oauth2client.locked_file-module.html#__package__"
-     >oauth2client.locked_file.__package__</a><br />    <a target="mainFrame" href="oauth2client.locked_file-module.html#logger"
-     >oauth2client.locked_file.logger</a><br />    <a target="mainFrame" href="oauth2client.multistore_file-module.html#__package__"
-     >oauth2client.multistore_file.__package__</a><br />  <div class="private">
+    <a target="mainFrame" href="oauth2client.locked_file-module.html#logger"
+     >oauth2client.locked_file.logger</a><br />  <div class="private">
     <a target="mainFrame" href="oauth2client.multistore_file-module.html#_multistores"
      >oauth2client.multistore_file._multistores</a><br />  </div>
   <div class="private">
@@ -285,21 +281,14 @@
     <a target="mainFrame" href="oauth2client.tools-module.html#FLAGS"
      >oauth2client.tools.FLAGS</a><br />  </div>
   <div class="private">
-    <a target="mainFrame" href="oauth2client.tools-module.html#__package__"
-     >oauth2client.tools.__package__</a><br />  </div>
-  <div class="private">
     <a target="mainFrame" href="oauth2client.util-module.html#FLAGS"
      >oauth2client.util.FLAGS</a><br />  </div>
   <div class="private">
-    <a target="mainFrame" href="oauth2client.util-module.html#__package__"
-     >oauth2client.util.__package__</a><br />  </div>
-  <div class="private">
     <a target="mainFrame" href="oauth2client.util-module.html#logger"
      >oauth2client.util.logger</a><br />  </div>
     <a target="mainFrame" href="oauth2client.xsrfutil-module.html#DEFAULT_TIMEOUT_SECS"
      >oauth2client.xsrfutil.DEFAULT_TIMEOUT_SECS</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#DELIMITER"
-     >oauth2client.xsrfutil.DELIMITER</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#__package__"
-     >oauth2client.xsrfutil.__package__</a><br /><hr />
+     >oauth2client.xsrfutil.DELIMITER</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-oauth2client-module.html b/docs/epy/toc-oauth2client-module.html
index 29f6cd3..fa3c8b8 100644
--- a/docs/epy/toc-oauth2client-module.html
+++ b/docs/epy/toc-oauth2client-module.html
@@ -12,9 +12,7 @@
       alink="#204080">
 <h1 class="toc">Module oauth2client</h1>
 <hr />
-  <h2 class="toc">Variables</h2>
-    <a target="mainFrame" href="oauth2client-module.html#__package__"
-     >__package__</a><br /><hr />
+<hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-oauth2client.anyjson-module.html b/docs/epy/toc-oauth2client.anyjson-module.html
index 87aaf88..d0dbce9 100644
--- a/docs/epy/toc-oauth2client.anyjson-module.html
+++ b/docs/epy/toc-oauth2client.anyjson-module.html
@@ -12,9 +12,7 @@
       alink="#204080">
 <h1 class="toc">Module anyjson</h1>
 <hr />
-  <h2 class="toc">Variables</h2>
-    <a target="mainFrame" href="oauth2client.anyjson-module.html#__package__"
-     >__package__</a><br /><hr />
+<hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-oauth2client.appengine-module.html b/docs/epy/toc-oauth2client.appengine-module.html
index 03f8e99..1d68b1d 100644
--- a/docs/epy/toc-oauth2client.appengine-module.html
+++ b/docs/epy/toc-oauth2client.appengine-module.html
@@ -36,12 +36,12 @@
   <div class="private">
     <a target="mainFrame" href="oauth2client.appengine-module.html#_safe_html"
      >_safe_html</a><br />  </div>
-    <a target="mainFrame" href="oauth2client.appengine-module.html#xsrf_secret_key"
+    <a target="mainFrame" href="oauth2client.appengine-module.html#oauth2decorator_from_clientsecrets"
+     >oauth2decorator_from_clientsecrets</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#xsrf_secret_key"
      >xsrf_secret_key</a><br />  <h2 class="toc">Variables</h2>
     <a target="mainFrame" href="oauth2client.appengine-module.html#OAUTH2CLIENT_NAMESPACE"
      >OAUTH2CLIENT_NAMESPACE</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#XSRF_MEMCACHE_ID"
-     >XSRF_MEMCACHE_ID</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#__package__"
-     >__package__</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#logger"
+     >XSRF_MEMCACHE_ID</a><br />    <a target="mainFrame" href="oauth2client.appengine-module.html#logger"
      >logger</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
diff --git a/docs/epy/toc-oauth2client.client-module.html b/docs/epy/toc-oauth2client.client-module.html
index b705db1..b6dd090 100644
--- a/docs/epy/toc-oauth2client.client-module.html
+++ b/docs/epy/toc-oauth2client.client-module.html
@@ -41,13 +41,16 @@
   <div class="private">
     <a target="mainFrame" href="oauth2client.client-module.html#_urlsafe_b64decode"
      >_urlsafe_b64decode</a><br />  </div>
-  <h2 class="toc">Variables</h2>
+    <a target="mainFrame" href="oauth2client.client-module.html#credentials_from_clientsecrets_and_code"
+     >credentials_from_clientsecrets_and_code</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#credentials_from_code"
+     >credentials_from_code</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#flow_from_clientsecrets"
+     >flow_from_clientsecrets</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#verify_id_token"
+     >verify_id_token</a><br />  <h2 class="toc">Variables</h2>
     <a target="mainFrame" href="oauth2client.client-module.html#EXPIRY_FORMAT"
      >EXPIRY_FORMAT</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#HAS_OPENSSL"
      >HAS_OPENSSL</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#ID_TOKEN_VERIFICATON_CERTS"
      >ID_TOKEN_VERIFICATON_CERTS</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#OOB_CALLBACK_URN"
-     >OOB_CALLBACK_URN</a><br />    <a target="mainFrame" href="oauth2client.client-module.html#__package__"
-     >__package__</a><br />  <div class="private">
+     >OOB_CALLBACK_URN</a><br />  <div class="private">
     <a target="mainFrame" href="oauth2client.client-module.html#_cached_http"
      >_cached_http</a><br />  </div>
     <a target="mainFrame" href="oauth2client.client-module.html#logger"
diff --git a/docs/epy/toc-oauth2client.clientsecrets-module.html b/docs/epy/toc-oauth2client.clientsecrets-module.html
index c1feba9..f60223b 100644
--- a/docs/epy/toc-oauth2client.clientsecrets-module.html
+++ b/docs/epy/toc-oauth2client.clientsecrets-module.html
@@ -29,8 +29,7 @@
     <a target="mainFrame" href="oauth2client.clientsecrets-module.html#TYPE_INSTALLED"
      >TYPE_INSTALLED</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#TYPE_WEB"
      >TYPE_WEB</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#VALID_CLIENT"
-     >VALID_CLIENT</a><br />    <a target="mainFrame" href="oauth2client.clientsecrets-module.html#__package__"
-     >__package__</a><br /><hr />
+     >VALID_CLIENT</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-oauth2client.crypt-module.html b/docs/epy/toc-oauth2client.crypt-module.html
index 65538c6..b610c53 100644
--- a/docs/epy/toc-oauth2client.crypt-module.html
+++ b/docs/epy/toc-oauth2client.crypt-module.html
@@ -32,8 +32,7 @@
     <a target="mainFrame" href="oauth2client.crypt-module.html#AUTH_TOKEN_LIFETIME_SECS"
      >AUTH_TOKEN_LIFETIME_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#CLOCK_SKEW_SECS"
      >CLOCK_SKEW_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#MAX_TOKEN_LIFETIME_SECS"
-     >MAX_TOKEN_LIFETIME_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#__package__"
-     >__package__</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#logger"
+     >MAX_TOKEN_LIFETIME_SECS</a><br />    <a target="mainFrame" href="oauth2client.crypt-module.html#logger"
      >logger</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
diff --git a/docs/epy/toc-oauth2client.django_orm-module.html b/docs/epy/toc-oauth2client.django_orm-module.html
index 7b1e745..a32834d 100644
--- a/docs/epy/toc-oauth2client.django_orm-module.html
+++ b/docs/epy/toc-oauth2client.django_orm-module.html
@@ -16,9 +16,7 @@
     <a target="mainFrame" href="oauth2client.django_orm.CredentialsField-class.html"
      >CredentialsField</a><br />    <a target="mainFrame" href="oauth2client.django_orm.FlowField-class.html"
      >FlowField</a><br />    <a target="mainFrame" href="oauth2client.django_orm.Storage-class.html"
-     >Storage</a><br />  <h2 class="toc">Variables</h2>
-    <a target="mainFrame" href="oauth2client.django_orm-module.html#__package__"
-     >__package__</a><br /><hr />
+     >Storage</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-oauth2client.file-module.html b/docs/epy/toc-oauth2client.file-module.html
index 98e7087..ac6305b 100644
--- a/docs/epy/toc-oauth2client.file-module.html
+++ b/docs/epy/toc-oauth2client.file-module.html
@@ -15,9 +15,7 @@
   <h2 class="toc">Classes</h2>
     <a target="mainFrame" href="oauth2client.file.CredentialsFileSymbolicLinkError-class.html"
      >CredentialsFileSymbolicLinkError</a><br />    <a target="mainFrame" href="oauth2client.file.Storage-class.html"
-     >Storage</a><br />  <h2 class="toc">Variables</h2>
-    <a target="mainFrame" href="oauth2client.file-module.html#__package__"
-     >__package__</a><br /><hr />
+     >Storage</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-oauth2client.gce-module.html b/docs/epy/toc-oauth2client.gce-module.html
index 99fb399..8b27668 100644
--- a/docs/epy/toc-oauth2client.gce-module.html
+++ b/docs/epy/toc-oauth2client.gce-module.html
@@ -16,8 +16,7 @@
     <a target="mainFrame" href="oauth2client.gce.AppAssertionCredentials-class.html"
      >AppAssertionCredentials</a><br />  <h2 class="toc">Variables</h2>
     <a target="mainFrame" href="oauth2client.gce-module.html#META"
-     >META</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#__package__"
-     >__package__</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#logger"
+     >META</a><br />    <a target="mainFrame" href="oauth2client.gce-module.html#logger"
      >logger</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
diff --git a/docs/epy/toc-oauth2client.keyring_storage-module.html b/docs/epy/toc-oauth2client.keyring_storage-module.html
index fab1765..1fc9738 100644
--- a/docs/epy/toc-oauth2client.keyring_storage-module.html
+++ b/docs/epy/toc-oauth2client.keyring_storage-module.html
@@ -14,9 +14,7 @@
 <hr />
   <h2 class="toc">Classes</h2>
     <a target="mainFrame" href="oauth2client.keyring_storage.Storage-class.html"
-     >Storage</a><br />  <h2 class="toc">Variables</h2>
-    <a target="mainFrame" href="oauth2client.keyring_storage-module.html#__package__"
-     >__package__</a><br /><hr />
+     >Storage</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
 
diff --git a/docs/epy/toc-oauth2client.locked_file-module.html b/docs/epy/toc-oauth2client.locked_file-module.html
index 94b2586..51c5e73 100644
--- a/docs/epy/toc-oauth2client.locked_file-module.html
+++ b/docs/epy/toc-oauth2client.locked_file-module.html
@@ -17,9 +17,6 @@
      >AlreadyLockedException</a><br />    <a target="mainFrame" href="oauth2client.locked_file.CredentialsFileSymbolicLinkError-class.html"
      >CredentialsFileSymbolicLinkError</a><br />    <a target="mainFrame" href="oauth2client.locked_file.LockedFile-class.html"
      >LockedFile</a><br />  <div class="private">
-    <a target="mainFrame" href="oauth2client.locked_file._FcntlOpener-class.html"
-     >_FcntlOpener</a><br />  </div>
-  <div class="private">
     <a target="mainFrame" href="oauth2client.locked_file._Opener-class.html"
      >_Opener</a><br />  </div>
   <div class="private">
@@ -29,10 +26,12 @@
     <a target="mainFrame" href="oauth2client.locked_file-module.html#validate_file"
      >validate_file</a><br />  <h2 class="toc">Variables</h2>
   <div class="private">
+    <a target="mainFrame" href="oauth2client.locked_file-module.html#_FcntlOpener"
+     >_FcntlOpener</a><br />  </div>
+  <div class="private">
     <a target="mainFrame" href="oauth2client.locked_file-module.html#_Win32Opener"
      >_Win32Opener</a><br />  </div>
-    <a target="mainFrame" href="oauth2client.locked_file-module.html#__package__"
-     >__package__</a><br />    <a target="mainFrame" href="oauth2client.locked_file-module.html#logger"
+    <a target="mainFrame" href="oauth2client.locked_file-module.html#logger"
      >logger</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
diff --git a/docs/epy/toc-oauth2client.multistore_file-module.html b/docs/epy/toc-oauth2client.multistore_file-module.html
index 7321192..91593db 100644
--- a/docs/epy/toc-oauth2client.multistore_file-module.html
+++ b/docs/epy/toc-oauth2client.multistore_file-module.html
@@ -18,9 +18,10 @@
      >NewerCredentialStoreError</a><br />  <div class="private">
     <a target="mainFrame" href="oauth2client.multistore_file._MultiStore-class.html"
      >_MultiStore</a><br />  </div>
-  <h2 class="toc">Variables</h2>
-    <a target="mainFrame" href="oauth2client.multistore_file-module.html#__package__"
-     >__package__</a><br />  <div class="private">
+  <h2 class="toc">Functions</h2>
+    <a target="mainFrame" href="oauth2client.multistore_file-module.html#get_credential_storage"
+     >get_credential_storage</a><br />  <h2 class="toc">Variables</h2>
+  <div class="private">
     <a target="mainFrame" href="oauth2client.multistore_file-module.html#_multistores"
      >_multistores</a><br />  </div>
   <div class="private">
diff --git a/docs/epy/toc-oauth2client.tools-module.html b/docs/epy/toc-oauth2client.tools-module.html
index 4c6f1db..adfe3df 100644
--- a/docs/epy/toc-oauth2client.tools-module.html
+++ b/docs/epy/toc-oauth2client.tools-module.html
@@ -25,9 +25,6 @@
   <div class="private">
     <a target="mainFrame" href="oauth2client.tools-module.html#FLAGS"
      >FLAGS</a><br />  </div>
-  <div class="private">
-    <a target="mainFrame" href="oauth2client.tools-module.html#__package__"
-     >__package__</a><br />  </div>
 <hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>
diff --git a/docs/epy/toc-oauth2client.util-module.html b/docs/epy/toc-oauth2client.util-module.html
index 28465a3..26721b8 100644
--- a/docs/epy/toc-oauth2client.util-module.html
+++ b/docs/epy/toc-oauth2client.util-module.html
@@ -19,9 +19,6 @@
     <a target="mainFrame" href="oauth2client.util-module.html#FLAGS"
      >FLAGS</a><br />  </div>
   <div class="private">
-    <a target="mainFrame" href="oauth2client.util-module.html#__package__"
-     >__package__</a><br />  </div>
-  <div class="private">
     <a target="mainFrame" href="oauth2client.util-module.html#logger"
      >logger</a><br />  </div>
 <hr />
diff --git a/docs/epy/toc-oauth2client.xsrfutil-module.html b/docs/epy/toc-oauth2client.xsrfutil-module.html
index ac86e93..938fef6 100644
--- a/docs/epy/toc-oauth2client.xsrfutil-module.html
+++ b/docs/epy/toc-oauth2client.xsrfutil-module.html
@@ -12,11 +12,13 @@
       alink="#204080">
 <h1 class="toc">Module xsrfutil</h1>
 <hr />
-  <h2 class="toc">Variables</h2>
+  <h2 class="toc">Functions</h2>
+    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#generate_token"
+     >generate_token</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#validate_token"
+     >validate_token</a><br />  <h2 class="toc">Variables</h2>
     <a target="mainFrame" href="oauth2client.xsrfutil-module.html#DEFAULT_TIMEOUT_SECS"
      >DEFAULT_TIMEOUT_SECS</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#DELIMITER"
-     >DELIMITER</a><br />    <a target="mainFrame" href="oauth2client.xsrfutil-module.html#__package__"
-     >__package__</a><br /><hr />
+     >DELIMITER</a><br /><hr />
 <span class="options">[<a href="javascript:void(0);" class="privatelink"
     onclick="toggle_private();">hide&nbsp;private</a>]</span>