Updated copyright notices where appropriate and refreshed generated docs.
diff --git a/FAQ b/FAQ
index deba976..dc736f2 100644
--- a/FAQ
+++ b/FAQ
@@ -2,6 +2,7 @@
Q: How do I work out the arguments and methods that are available for a particular API?
-A: http://api-python-client-doc.appspot.com/ has dynamically generated documentation for all the APIs supported by this library.
+A: http://api-python-client-doc.appspot.com/ has dynamically generated
+ documentation for all the APIs supported by this library.
diff --git a/README b/README
index 38f18b5..9a7b28c 100644
--- a/README
+++ b/README
@@ -45,8 +45,7 @@
Third Party Libraries
=====================
-These libraries should be installed when you install the client library, either
-automatically if you have setuptools installed, or manually if you do not:
+These libraries will be installed when you install the client library:
http://code.google.com/p/httplib2
http://code.google.com/p/uri-templates
diff --git a/TODO b/TODO
index f95e6b2..aeca34a 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,4 @@
TODO
====
- - LICENSE file
-
- - OAuth cmdline sample should start local http server to catch response.
-
- - Caching of discovery doc
-
- - Examples of caching
-
- - 2.x and 3.x compatible
-
+ - Maybe support Python 3.x?
diff --git a/apiclient/errors.py b/apiclient/errors.py
index 0d81ec3..189dd52 100644
--- a/apiclient/errors.py
+++ b/apiclient/errors.py
@@ -1,6 +1,18 @@
#!/usr/bin/python2.4
#
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""Errors for the library.
diff --git a/apiclient/ext/django_orm.py b/apiclient/ext/django_orm.py
index c92c3af..84b0d74 100644
--- a/apiclient/ext/django_orm.py
+++ b/apiclient/ext/django_orm.py
@@ -1,3 +1,17 @@
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
import apiclient
import base64
import pickle
diff --git a/apiclient/ext/file.py b/apiclient/ext/file.py
index a243fd2..ed1a18c 100644
--- a/apiclient/ext/file.py
+++ b/apiclient/ext/file.py
@@ -1,4 +1,16 @@
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""Utilities for OAuth.
diff --git a/apiclient/http.py b/apiclient/http.py
index 8c81ad4..2481c23 100644
--- a/apiclient/http.py
+++ b/apiclient/http.py
@@ -1,4 +1,16 @@
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""Classes to encapsulate a single HTTP request.
diff --git a/apiclient/model.py b/apiclient/model.py
index 1e5b862..7bc6858 100644
--- a/apiclient/model.py
+++ b/apiclient/model.py
@@ -1,6 +1,18 @@
#!/usr/bin/python2.4
#
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""Model objects for requests and responses.
diff --git a/apiclient/oauth.py b/apiclient/oauth.py
index 618b29f..430d068 100644
--- a/apiclient/oauth.py
+++ b/apiclient/oauth.py
@@ -1,4 +1,16 @@
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""Utilities for OAuth.
diff --git a/contrib/buzz/simple_wrapper.py b/contrib/buzz/simple_wrapper.py
index 7689a28..49c6038 100644
--- a/contrib/buzz/simple_wrapper.py
+++ b/contrib/buzz/simple_wrapper.py
@@ -1,6 +1,18 @@
#!/usr/bin/python2.4
#
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
__author__ = 'ade@google.com (Ade Oshineye)'
@@ -67,4 +79,4 @@
members = cmd.execute()
if 'totalResults' not in members.keys():
return -1
- return members['totalResults']
\ No newline at end of file
+ return members['totalResults']
diff --git a/describe.py b/describe.py
index 4f7fe96..fd8c89d 100644
--- a/describe.py
+++ b/describe.py
@@ -1,23 +1,32 @@
+#!/usr/bin/env python
+#
+# Copyright 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+__author__ = 'jcgregorio@google.com (Joe Gregorio)'
+
import os
import pydoc
import re
+import sys
+import httplib2
+from apiclient.anyjson import simplejson
from apiclient.discovery import build
BASE = 'docs/dyn'
-APIS = [
- ('buzz', 'v1'),
- ('moderator', 'v1'),
- ('latitude', 'v1'),
- ('customsearch', 'v1'),
- ('diacritize', 'v1'),
- ('translate', 'v2'),
- ('prediction', 'v1.1'),
- ('shopping', 'v1'),
- ('urlshortener', 'v1'),
- ]
-
def document(resource, path):
print path
collections = []
@@ -44,6 +53,11 @@
document(service, '%s.%s.' % (name, version))
if __name__ == '__main__':
- for name, version in APIS:
- document_api(name, version)
-
+ http = httplib2.Http()
+ resp, content = http.request('https://www.googleapis.com/discovery/v0.3/directory?preferred=true')
+ if resp.status == 200:
+ directory = simplejson.loads(content)['items']
+ for api in directory:
+ document_api(api['name'], api['version'])
+ else:
+ sys.exit("Failed to load the discovery document.")
diff --git a/docs/apiclient.anyjson.html b/docs/apiclient.anyjson.html
index 7471a08..aed7393 100644
--- a/docs/apiclient.anyjson.html
+++ b/docs/apiclient.anyjson.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.anyjson</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/anyjson.py">/home/jcgregorio/projects/apiary/apiclient/anyjson.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/anyjson.py">/home/jcgregorio/projects/apiclient-release/apiclient/anyjson.py</a></font></td></tr></table>
<p><tt>Utility module to import a JSON module<br>
<br>
Hides all the messy details of exactly where<br>
diff --git a/docs/apiclient.contrib.html b/docs/apiclient.contrib.html
deleted file mode 100644
index 5950718..0000000
--- a/docs/apiclient.contrib.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: package apiclient.contrib</title>
-</head><body bgcolor="#f0f0f8">
-
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
-<tr bgcolor="#7799ee">
-<td valign=bottom> <br>
-<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.contrib</strong></big></big></font></td
-><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/contrib/__init__.py">/home/jcgregorio/projects/apiary/apiclient/contrib/__init__.py</a></font></td></tr></table>
- <p></p>
-<p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#aa55cc">
-<td colspan=3 valign=bottom> <br>
-<font color="#ffffff" face="helvetica, arial"><big><strong>Package Contents</strong></big></font></td></tr>
-
-<tr><td bgcolor="#aa55cc"><tt> </tt></td><td> </td>
-<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="apiclient.contrib.buzz.html"><strong>buzz</strong> (package)</a><br>
-</td><td width="25%" valign=top></td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/docs/apiclient.discovery.html b/docs/apiclient.discovery.html
index 0f0a75e..0fc8a73 100644
--- a/docs/apiclient.discovery.html
+++ b/docs/apiclient.discovery.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.discovery</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/discovery.py">/home/jcgregorio/projects/apiary/apiclient/discovery.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/discovery.py">/home/jcgregorio/projects/apiclient-release/apiclient/discovery.py</a></font></td></tr></table>
<p><tt>Client for discovery based APIs<br>
<br>
A client library for Google's discovery based APIs.</tt></p>
diff --git a/docs/apiclient.errors.html b/docs/apiclient.errors.html
index d19fb96..c99feec 100644
--- a/docs/apiclient.errors.html
+++ b/docs/apiclient.errors.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.errors</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/errors.py">/home/jcgregorio/projects/apiary/apiclient/errors.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/errors.py">/home/jcgregorio/projects/apiclient-release/apiclient/errors.py</a></font></td></tr></table>
<p><tt>Errors for the library.<br>
<br>
All exceptions defined by the library<br>
diff --git a/docs/apiclient.ext.authtools.html b/docs/apiclient.ext.authtools.html
index 63c30ea..7f77886 100644
--- a/docs/apiclient.ext.authtools.html
+++ b/docs/apiclient.ext.authtools.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.<a href="apiclient.ext.html"><font color="#ffffff">ext</font></a>.authtools</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/ext/authtools.py">/home/jcgregorio/projects/apiary/apiclient/ext/authtools.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/ext/authtools.py">/home/jcgregorio/projects/apiclient-release/apiclient/ext/authtools.py</a></font></td></tr></table>
<p><tt>Command-line tools for authenticating via OAuth 1.0<br>
<br>
Do the OAuth 1.0 Three Legged Dance for<br>
diff --git a/docs/apiclient.ext.django_orm.html b/docs/apiclient.ext.django_orm.html
index 28d728f..ef8c965 100644
--- a/docs/apiclient.ext.django_orm.html
+++ b/docs/apiclient.ext.django_orm.html
@@ -8,8 +8,20 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.<a href="apiclient.ext.html"><font color="#ffffff">ext</font></a>.django_orm</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/ext/django_orm.py">/usr/local/google/home/jcgregorio/projects/apiclient/apiclient/ext/django_orm.py</a></font></td></tr></table>
- <p></p>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/ext/django_orm.py">/home/jcgregorio/projects/apiclient-release/apiclient/ext/django_orm.py</a></font></td></tr></table>
+ <p><tt># Copyright (C) 2010 Google Inc.<br>
+#<br>
+# Licensed under the Apache License, Version 2.0 (the "License");<br>
+# you may not use this file except in compliance with the License.<br>
+# You may obtain a copy of the License at<br>
+#<br>
+# <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a><br>
+#<br>
+# Unless required by applicable law or agreed to in writing, software<br>
+# distributed under the License is distributed on an "AS IS" BASIS,<br>
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<br>
+# See the License for the specific language governing permissions and<br>
+# limitations under the License.</tt></p>
<p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#aa55cc">
@@ -53,9 +65,13 @@
Methods defined here:<br>
<dl><dt><a name="FlowThreeLeggedField-contribute_to_class"><strong>contribute_to_class</strong></a>(self, cls, name)</dt></dl>
-<dl><dt><a name="FlowThreeLeggedField-db_type"><strong>db_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="FlowThreeLeggedField-db_type"><strong>db_type</strong></a> = inner(*args, **kwargs)</dt></dl>
-<dl><dt><a name="FlowThreeLeggedField-get_db_prep_value"><strong>get_db_prep_value</strong></a>(self, value)</dt></dl>
+<dl><dt><a name="FlowThreeLeggedField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="FlowThreeLeggedField-get_db_prep_save"><strong>get_db_prep_save</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="FlowThreeLeggedField-get_db_prep_value"><strong>get_db_prep_value</strong></a> = inner(*args, **kwargs)</dt></dl>
<dl><dt><a name="FlowThreeLeggedField-to_python"><strong>to_python</strong></a>(self, value)</dt></dl>
@@ -70,10 +86,14 @@
<dl><dt><a name="FlowThreeLeggedField-__deepcopy__"><strong>__deepcopy__</strong></a>(self, memodict)</dt></dl>
-<dl><dt><a name="FlowThreeLeggedField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=<class django.db.models.fields.NOT_PROVIDED></font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>)</dt></dl>
+<dl><dt><a name="FlowThreeLeggedField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=<class django.db.models.fields.NOT_PROVIDED></font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>, validators<font color="#909090">=[]</font>, error_messages<font color="#909090">=None</font>)</dt></dl>
<dl><dt><a name="FlowThreeLeggedField-bind"><strong>bind</strong></a>(self, fieldmapping, original, bound_field_class)</dt></dl>
+<dl><dt><a name="FlowThreeLeggedField-clean"><strong>clean</strong></a>(self, value, model_instance)</dt><dd><tt>Convert the value's type and run validation. Validation errors from to_python<br>
+and validate are propagated. The correct value is returned if no error is<br>
+raised.</tt></dd></dl>
+
<dl><dt><a name="FlowThreeLeggedField-formfield"><strong>formfield</strong></a>(self, form_class<font color="#909090">=<class 'django.forms.fields.CharField'></font>, **kwargs)</dt><dd><tt>Returns a django.forms.<a href="django.db.models.fields.html#Field">Field</a> instance for this database <a href="django.db.models.fields.html#Field">Field</a>.</tt></dd></dl>
<dl><dt><a name="FlowThreeLeggedField-get_attname"><strong>get_attname</strong></a>(self)</dt></dl>
@@ -87,26 +107,31 @@
<dl><dt><a name="FlowThreeLeggedField-get_choices_default"><strong>get_choices_default</strong></a>(self)</dt></dl>
-<dl><dt><a name="FlowThreeLeggedField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Returns field's value prepared for database lookup.</tt></dd></dl>
-
-<dl><dt><a name="FlowThreeLeggedField-get_db_prep_save"><strong>get_db_prep_save</strong></a>(self, value)</dt><dd><tt>Returns field's value prepared for saving into a database.</tt></dd></dl>
-
<dl><dt><a name="FlowThreeLeggedField-get_default"><strong>get_default</strong></a>(self)</dt><dd><tt>Returns the default value for this field.</tt></dd></dl>
<dl><dt><a name="FlowThreeLeggedField-get_flatchoices"><strong>get_flatchoices</strong></a>(self, include_blank<font color="#909090">=True</font>, blank_choice<font color="#909090">=[('', '---------')]</font>)</dt><dd><tt>Returns flattened choices with a default blank choice included.</tt></dd></dl>
<dl><dt><a name="FlowThreeLeggedField-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="FlowThreeLeggedField-get_prep_lookup"><strong>get_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Perform preliminary non-db specific lookup checks and conversions</tt></dd></dl>
+
+<dl><dt><a name="FlowThreeLeggedField-get_prep_value"><strong>get_prep_value</strong></a>(self, value)</dt><dd><tt>Perform preliminary non-db specific value checks and conversions.</tt></dd></dl>
+
<dl><dt><a name="FlowThreeLeggedField-get_validator_unique_lookup_type"><strong>get_validator_unique_lookup_type</strong></a>(self)</dt></dl>
<dl><dt><a name="FlowThreeLeggedField-has_default"><strong>has_default</strong></a>(self)</dt><dd><tt>Returns a boolean of whether this field has a default value.</tt></dd></dl>
<dl><dt><a name="FlowThreeLeggedField-pre_save"><strong>pre_save</strong></a>(self, model_instance, add)</dt><dd><tt>Returns field's value just before saving.</tt></dd></dl>
+<dl><dt><a name="FlowThreeLeggedField-run_validators"><strong>run_validators</strong></a>(self, value)</dt></dl>
+
<dl><dt><a name="FlowThreeLeggedField-save_form_data"><strong>save_form_data</strong></a>(self, instance, data)</dt></dl>
<dl><dt><a name="FlowThreeLeggedField-set_attributes_from_name"><strong>set_attributes_from_name</strong></a>(self, name)</dt></dl>
+<dl><dt><a name="FlowThreeLeggedField-validate"><strong>validate</strong></a>(self, value, model_instance)</dt><dd><tt>Validates value and throws ValidationError. Subclasses should override<br>
+this to provide validation logic.</tt></dd></dl>
+
<dl><dt><a name="FlowThreeLeggedField-value_from_object"><strong>value_from_object</strong></a>(self, obj)</dt><dd><tt>Returns the value of this field in the given model instance.</tt></dd></dl>
<dl><dt><a name="FlowThreeLeggedField-value_to_string"><strong>value_to_string</strong></a>(self, obj)</dt><dd><tt>Returns a string value of this field from the passed obj.<br>
@@ -122,6 +147,8 @@
</dl>
<dl><dt><strong>choices</strong></dt>
</dl>
+<dl><dt><strong>description</strong></dt>
+</dl>
<dl><dt><strong>flatchoices</strong></dt>
<dd><tt>Flattened version of choices tuple.</tt></dd>
</dl>
@@ -133,6 +160,10 @@
<dl><dt><strong>creation_counter</strong> = 0</dl>
+<dl><dt><strong>default_error_messages</strong> = {'blank': <django.utils.functional.__proxy__ object>, 'invalid_choice': <django.utils.functional.__proxy__ object>, 'null': <django.utils.functional.__proxy__ object>}</dl>
+
+<dl><dt><strong>default_validators</strong> = []</dl>
+
<dl><dt><strong>empty_strings_allowed</strong> = True</dl>
</td></tr></table> <p>
@@ -151,9 +182,13 @@
Methods defined here:<br>
<dl><dt><a name="OAuthCredentialsField-contribute_to_class"><strong>contribute_to_class</strong></a>(self, cls, name)</dt></dl>
-<dl><dt><a name="OAuthCredentialsField-db_type"><strong>db_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="OAuthCredentialsField-db_type"><strong>db_type</strong></a> = inner(*args, **kwargs)</dt></dl>
-<dl><dt><a name="OAuthCredentialsField-get_db_prep_value"><strong>get_db_prep_value</strong></a>(self, value)</dt></dl>
+<dl><dt><a name="OAuthCredentialsField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="OAuthCredentialsField-get_db_prep_save"><strong>get_db_prep_save</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="OAuthCredentialsField-get_db_prep_value"><strong>get_db_prep_value</strong></a> = inner(*args, **kwargs)</dt></dl>
<dl><dt><a name="OAuthCredentialsField-to_python"><strong>to_python</strong></a>(self, value)</dt></dl>
@@ -168,10 +203,14 @@
<dl><dt><a name="OAuthCredentialsField-__deepcopy__"><strong>__deepcopy__</strong></a>(self, memodict)</dt></dl>
-<dl><dt><a name="OAuthCredentialsField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=<class django.db.models.fields.NOT_PROVIDED></font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>)</dt></dl>
+<dl><dt><a name="OAuthCredentialsField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=<class django.db.models.fields.NOT_PROVIDED></font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>, validators<font color="#909090">=[]</font>, error_messages<font color="#909090">=None</font>)</dt></dl>
<dl><dt><a name="OAuthCredentialsField-bind"><strong>bind</strong></a>(self, fieldmapping, original, bound_field_class)</dt></dl>
+<dl><dt><a name="OAuthCredentialsField-clean"><strong>clean</strong></a>(self, value, model_instance)</dt><dd><tt>Convert the value's type and run validation. Validation errors from to_python<br>
+and validate are propagated. The correct value is returned if no error is<br>
+raised.</tt></dd></dl>
+
<dl><dt><a name="OAuthCredentialsField-formfield"><strong>formfield</strong></a>(self, form_class<font color="#909090">=<class 'django.forms.fields.CharField'></font>, **kwargs)</dt><dd><tt>Returns a django.forms.<a href="django.db.models.fields.html#Field">Field</a> instance for this database <a href="django.db.models.fields.html#Field">Field</a>.</tt></dd></dl>
<dl><dt><a name="OAuthCredentialsField-get_attname"><strong>get_attname</strong></a>(self)</dt></dl>
@@ -185,26 +224,31 @@
<dl><dt><a name="OAuthCredentialsField-get_choices_default"><strong>get_choices_default</strong></a>(self)</dt></dl>
-<dl><dt><a name="OAuthCredentialsField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Returns field's value prepared for database lookup.</tt></dd></dl>
-
-<dl><dt><a name="OAuthCredentialsField-get_db_prep_save"><strong>get_db_prep_save</strong></a>(self, value)</dt><dd><tt>Returns field's value prepared for saving into a database.</tt></dd></dl>
-
<dl><dt><a name="OAuthCredentialsField-get_default"><strong>get_default</strong></a>(self)</dt><dd><tt>Returns the default value for this field.</tt></dd></dl>
<dl><dt><a name="OAuthCredentialsField-get_flatchoices"><strong>get_flatchoices</strong></a>(self, include_blank<font color="#909090">=True</font>, blank_choice<font color="#909090">=[('', '---------')]</font>)</dt><dd><tt>Returns flattened choices with a default blank choice included.</tt></dd></dl>
<dl><dt><a name="OAuthCredentialsField-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="OAuthCredentialsField-get_prep_lookup"><strong>get_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Perform preliminary non-db specific lookup checks and conversions</tt></dd></dl>
+
+<dl><dt><a name="OAuthCredentialsField-get_prep_value"><strong>get_prep_value</strong></a>(self, value)</dt><dd><tt>Perform preliminary non-db specific value checks and conversions.</tt></dd></dl>
+
<dl><dt><a name="OAuthCredentialsField-get_validator_unique_lookup_type"><strong>get_validator_unique_lookup_type</strong></a>(self)</dt></dl>
<dl><dt><a name="OAuthCredentialsField-has_default"><strong>has_default</strong></a>(self)</dt><dd><tt>Returns a boolean of whether this field has a default value.</tt></dd></dl>
<dl><dt><a name="OAuthCredentialsField-pre_save"><strong>pre_save</strong></a>(self, model_instance, add)</dt><dd><tt>Returns field's value just before saving.</tt></dd></dl>
+<dl><dt><a name="OAuthCredentialsField-run_validators"><strong>run_validators</strong></a>(self, value)</dt></dl>
+
<dl><dt><a name="OAuthCredentialsField-save_form_data"><strong>save_form_data</strong></a>(self, instance, data)</dt></dl>
<dl><dt><a name="OAuthCredentialsField-set_attributes_from_name"><strong>set_attributes_from_name</strong></a>(self, name)</dt></dl>
+<dl><dt><a name="OAuthCredentialsField-validate"><strong>validate</strong></a>(self, value, model_instance)</dt><dd><tt>Validates value and throws ValidationError. Subclasses should override<br>
+this to provide validation logic.</tt></dd></dl>
+
<dl><dt><a name="OAuthCredentialsField-value_from_object"><strong>value_from_object</strong></a>(self, obj)</dt><dd><tt>Returns the value of this field in the given model instance.</tt></dd></dl>
<dl><dt><a name="OAuthCredentialsField-value_to_string"><strong>value_to_string</strong></a>(self, obj)</dt><dd><tt>Returns a string value of this field from the passed obj.<br>
@@ -220,6 +264,8 @@
</dl>
<dl><dt><strong>choices</strong></dt>
</dl>
+<dl><dt><strong>description</strong></dt>
+</dl>
<dl><dt><strong>flatchoices</strong></dt>
<dd><tt>Flattened version of choices tuple.</tt></dd>
</dl>
@@ -231,6 +277,10 @@
<dl><dt><strong>creation_counter</strong> = 0</dl>
+<dl><dt><strong>default_error_messages</strong> = {'blank': <django.utils.functional.__proxy__ object>, 'invalid_choice': <django.utils.functional.__proxy__ object>, 'null': <django.utils.functional.__proxy__ object>}</dl>
+
+<dl><dt><strong>default_validators</strong> = []</dl>
+
<dl><dt><strong>empty_strings_allowed</strong> = True</dl>
</td></tr></table></td></tr></table>
diff --git a/docs/apiclient.ext.file.html b/docs/apiclient.ext.file.html
index f11778f..ca90d5f 100644
--- a/docs/apiclient.ext.file.html
+++ b/docs/apiclient.ext.file.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.<a href="apiclient.ext.html"><font color="#ffffff">ext</font></a>.file</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/ext/file.py">/home/jcgregorio/projects/apiary/apiclient/ext/file.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/ext/file.py">/home/jcgregorio/projects/apiclient-release/apiclient/ext/file.py</a></font></td></tr></table>
<p><tt>Utilities for OAuth.<br>
<br>
Utilities for making it easier to work with OAuth 1.0 credentials.</tt></p>
diff --git a/docs/apiclient.ext.html b/docs/apiclient.ext.html
index d3b597d..502f4b6 100644
--- a/docs/apiclient.ext.html
+++ b/docs/apiclient.ext.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.ext</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/ext/__init__.py">/home/jcgregorio/projects/apiary/apiclient/ext/__init__.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/ext/__init__.py">/home/jcgregorio/projects/apiclient-release/apiclient/ext/__init__.py</a></font></td></tr></table>
<p></p>
<p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
diff --git a/docs/apiclient.html b/docs/apiclient.html
index 4e9ce70..1ca9194 100644
--- a/docs/apiclient.html
+++ b/docs/apiclient.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong>apiclient</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/__init__.py">/home/jcgregorio/projects/apiary/apiclient/__init__.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/__init__.py">/home/jcgregorio/projects/apiclient-release/apiclient/__init__.py</a></font></td></tr></table>
<p></p>
<p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
diff --git a/docs/apiclient.http.html b/docs/apiclient.http.html
index a9c5ce4..46037e9 100644
--- a/docs/apiclient.http.html
+++ b/docs/apiclient.http.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.http</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/http.py">/home/jcgregorio/projects/apiary/apiclient/http.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/http.py">/home/jcgregorio/projects/apiclient-release/apiclient/http.py</a></font></td></tr></table>
<p><tt>Classes to encapsulate a single HTTP request.<br>
<br>
The classes implement a command pattern, with every<br>
@@ -23,7 +23,8 @@
<tr><td bgcolor="#aa55cc"><tt> </tt></td><td> </td>
<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="httplib2.html">httplib2</a><br>
</td><td width="25%" valign=top><a href="os.html">os</a><br>
-</td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p>
+</td><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+</td><td width="25%" valign=top></td></tr></table></td></tr></table><p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#ee77aa">
<td colspan=3 valign=bottom> <br>
@@ -34,8 +35,7 @@
<dt><font face="helvetica, arial"><a href="__builtin__.html#object">__builtin__.object</a>
</font></dt><dd>
<dl>
-<dt><font face="helvetica, arial"><a href="apiclient.http.html#HttpMock">HttpMock</a>
-</font></dt><dt><font face="helvetica, arial"><a href="apiclient.http.html#HttpRequest">HttpRequest</a>
+<dt><font face="helvetica, arial"><a href="apiclient.http.html#HttpRequest">HttpRequest</a>
</font></dt><dt><font face="helvetica, arial"><a href="apiclient.http.html#RequestMockBuilder">RequestMockBuilder</a>
</font></dt></dl>
</dd>
@@ -44,30 +44,6 @@
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#ffc8d8">
<td colspan=3 valign=bottom> <br>
-<font color="#000000" face="helvetica, arial"><a name="HttpMock">class <strong>HttpMock</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
-
-<tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td>
-<td colspan=2><tt>Mock of httplib2.Http<br> </tt></td></tr>
-<tr><td> </td>
-<td width="100%">Methods defined here:<br>
-<dl><dt><a name="HttpMock-__init__"><strong>__init__</strong></a>(self, filename, headers<font color="#909090">=None</font>)</dt><dd><tt>Args:<br>
- filename: string, absolute filename to read response from<br>
- headers: dict, header to return with response</tt></dd></dl>
-
-<dl><dt><a name="HttpMock-request"><strong>request</strong></a>(self, uri, method<font color="#909090">='GET'</font>, body<font color="#909090">=None</font>, headers<font color="#909090">=None</font>, redirections<font color="#909090">=1</font>, connection_type<font color="#909090">=None</font>)</dt></dl>
-
-<hr>
-Data descriptors defined here:<br>
-<dl><dt><strong>__dict__</strong></dt>
-<dd><tt>dictionary for instance variables (if defined)</tt></dd>
-</dl>
-<dl><dt><strong>__weakref__</strong></dt>
-<dd><tt>list of weak references to the object (if defined)</tt></dd>
-</dl>
-</td></tr></table> <p>
-<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
-<tr bgcolor="#ffc8d8">
-<td colspan=3 valign=bottom> <br>
<font color="#000000" face="helvetica, arial"><a name="HttpRequest">class <strong>HttpRequest</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
<tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td>
@@ -164,12 +140,35 @@
</dl>
</td></tr></table></td></tr></table><p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
+<tr bgcolor="#eeaa77">
+<td colspan=3 valign=bottom> <br>
+<font color="#ffffff" face="helvetica, arial"><big><strong>Functions</strong></big></font></td></tr>
+
+<tr><td bgcolor="#eeaa77"><tt> </tt></td><td> </td>
+<td width="100%"><dl><dt><a name="-tunnel_patch"><strong>tunnel_patch</strong></a>(http)</dt><dd><tt>Tunnel PATCH requests over POST.<br>
+Args:<br>
+ http - An instance of httplib2.Http<br>
+ or something that acts like it.<br>
+ <br>
+Returns:<br>
+ A modified instance of http that was passed in.<br>
+ <br>
+Example:<br>
+ <br>
+ h = httplib2.Http()<br>
+ h = <a href="#-tunnel_patch">tunnel_patch</a>(h, "my-app-name/6.0")<br>
+ <br>
+Useful if you are running on a platform that doesn't support PATCH.<br>
+Apply this last if you are using OAuth 1.0, as changing the method<br>
+will result in a different signature.</tt></dd></dl>
+</td></tr></table><p>
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#55aa55">
<td colspan=3 valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"><big><strong>Data</strong></big></font></td></tr>
<tr><td bgcolor="#55aa55"><tt> </tt></td><td> </td>
-<td width="100%"><strong>__all__</strong> = ['HttpRequest', 'RequestMockBuilder', 'HttpMock']<br>
+<td width="100%"><strong>__all__</strong> = ['HttpRequest', 'RequestMockBuilder', 'HttpMockset_user_agent', 'tunnel_patch']<br>
<strong>__author__</strong> = 'jcgregorio@google.com (Joe Gregorio)'</td></tr></table><p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#7799ee">
diff --git a/docs/apiclient.model.html b/docs/apiclient.model.html
index 8d870d0..eb102e7 100644
--- a/docs/apiclient.model.html
+++ b/docs/apiclient.model.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.model</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/model.py">/home/jcgregorio/projects/apiary/apiclient/model.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/model.py">/home/jcgregorio/projects/apiclient-release/apiclient/model.py</a></font></td></tr></table>
<p><tt><a href="#Model">Model</a> objects for requests and responses.<br>
<br>
Each API may support one or more serializations, such<br>
diff --git a/docs/apiclient.oauth.html b/docs/apiclient.oauth.html
index 602e8f5..08eba24 100644
--- a/docs/apiclient.oauth.html
+++ b/docs/apiclient.oauth.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="apiclient.html"><font color="#ffffff">apiclient</font></a>.oauth</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/apiclient/oauth.py">/home/jcgregorio/projects/apiary/apiclient/oauth.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/apiclient/oauth.py">/home/jcgregorio/projects/apiclient-release/apiclient/oauth.py</a></font></td></tr></table>
<p><tt>Utilities for OAuth.<br>
<br>
Utilities for making it easier to work with OAuth.</tt></p>
diff --git a/docs/build.sh b/docs/build.sh
index 1c21da1..7ca3737 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -1,6 +1,19 @@
#!/bin/bash
#
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright 2007 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Author: jcgregorio@google.com (Joe Gregorio)
#
# Creates the documentation set for the library by
@@ -9,7 +22,7 @@
# Notes: You may have to update the location of the
# App Engine library for your local system.
-export GOOGLE_APPENGINE=$HOME/projects/google_appengine/
+export GOOGLE_APPENGINE=$HOME/projects/google_appengine
export DJANGO_SETTINGS_MODULE=fakesettings
export PYTHONPATH=`pwd`/..:$GOOGLE_APPENGINE
find ../apiclient/ -name "*.py" | sed "s/\/__init__.py//" | sed "s/\.py//" | sed "s/^\.\.\///" | sed "s#/#.#g" | xargs pydoc -w
diff --git a/docs/dyn/buzz.v1.activities.html b/docs/dyn/buzz.v1.activities.html
index e88dd37..d93169f 100644
--- a/docs/dyn/buzz.v1.activities.html
+++ b/docs/dyn/buzz.v1.activities.html
@@ -40,14 +40,14 @@
<br>
Args:<br>
c: string, A continuation token that allows pagination.<br>
- pid: string, ID of a place to use in a geographic location query.<br>
+ lat: string, Latitude to use in a geographic location query.<br>
lon: string, Longitude to use in a geographic location query.<br>
+ pid: string, ID of a place to use in a geographic location query.<br>
q: string, Full-text search query string.<br>
max_results: integer, Maximum number of results to include.<br>
radius: string, Radius to use in a geographic location query.<br>
bbox: string, Bounding box to use in a geographic location query.<br>
hl: string, Language code to limit language results.<br>
- lat: string, Latitude to use in a geographic location query.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
atom - Use Atom XML format<br>
@@ -57,8 +57,8 @@
<br>
Args:<br>
postId: string, ID of the post to get. (required)<br>
- userId: string, ID of the user whose post to get. (required)<br>
truncateAtom: boolean, Truncate the value of the atom:content element.<br>
+ userId: string, ID of the user whose post to get. (required)<br>
hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
@@ -83,8 +83,8 @@
<br>
Args:<br>
c: string, A continuation token that allows pagination.<br>
- userId: string, ID of the user being referenced. (required)<br>
truncateAtom: boolean, Truncate the value of the atom:content element.<br>
+ userId: string, ID of the user being referenced. (required)<br>
max_results: integer, Maximum number of results to include.<br>
hl: string, Language code to limit language results.<br>
scope: string, The collection of activities to list. (required)<br>
@@ -112,15 +112,15 @@
<br>
Args:<br>
c: string, A continuation token that allows pagination.<br>
- pid: string, ID of a place to use in a geographic location query.<br>
+ lat: string, Latitude to use in a geographic location query.<br>
lon: string, Longitude to use in a geographic location query.<br>
+ pid: string, ID of a place to use in a geographic location query.<br>
q: string, Full-text search query string.<br>
truncateAtom: boolean, Truncate the value of the atom:content element.<br>
max_results: integer, Maximum number of results to include.<br>
radius: string, Radius to use in a geographic location query.<br>
bbox: string, Bounding box to use in a geographic location query.<br>
hl: string, Language code to limit language results.<br>
- lat: string, Latitude to use in a geographic location query.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
atom - Use Atom XML format<br>
@@ -137,14 +137,14 @@
<br>
Args:<br>
c: string, A continuation token that allows pagination.<br>
- pid: string, ID of a place to use in a geographic location query.<br>
+ lat: string, Latitude to use in a geographic location query.<br>
lon: string, Longitude to use in a geographic location query.<br>
+ pid: string, ID of a place to use in a geographic location query.<br>
q: string, Full-text search query string.<br>
max_results: integer, Maximum number of results to include.<br>
radius: string, Radius to use in a geographic location query.<br>
bbox: string, Bounding box to use in a geographic location query.<br>
hl: string, Language code to limit language results.<br>
- lat: string, Latitude to use in a geographic location query.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
atom - Use Atom XML format<br>
diff --git a/docs/dyn/buzz.v1.groups.html b/docs/dyn/buzz.v1.groups.html
index 2e1404f..257bcff 100644
--- a/docs/dyn/buzz.v1.groups.html
+++ b/docs/dyn/buzz.v1.groups.html
@@ -17,35 +17,35 @@
<dl><dt><a name="Resource-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Delete a group<br>
<br>
Args:<br>
+ userId: string, ID of the user being referenced. (required)<br>
+ hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
atom - Use Atom XML format<br>
json - Use JSON format<br>
- hl: string, Language code to limit language results.<br>
- userId: string, ID of the user being referenced. (required)<br>
groupId: string, ID of the group to delete. (required)</tt></dd></dl>
<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get a group<br>
<br>
Args:<br>
+ userId: string, ID of the user being referenced. (required)<br>
+ hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
atom - Use Atom XML format<br>
json - Use JSON format<br>
- hl: string, Language code to limit language results.<br>
- userId: string, ID of the user being referenced. (required)<br>
groupId: string, ID of the group to get. (required)</tt></dd></dl>
<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Create a group<br>
<br>
Args:<br>
body: object, The request body. (required)<br>
+ userId: string, ID of the user being referenced. (required)<br>
+ hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
atom - Use Atom XML format<br>
- json - Use JSON format<br>
- userId: string, ID of the user being referenced. (required)<br>
- hl: string, Language code to limit language results.</tt></dd></dl>
+ json - Use JSON format</tt></dd></dl>
<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>Get a user's groups<br>
<br>
diff --git a/docs/dyn/buzz.v1.people.html b/docs/dyn/buzz.v1.people.html
index 19d9d35..e2ac0af 100644
--- a/docs/dyn/buzz.v1.people.html
+++ b/docs/dyn/buzz.v1.people.html
@@ -29,12 +29,12 @@
<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get a user profile<br>
<br>
Args:<br>
+ userId: string, ID of the user being referenced. (required)<br>
+ hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
atom - Use Atom XML format<br>
- json - Use JSON format<br>
- userId: string, ID of the user being referenced. (required)<br>
- hl: string, Language code to limit language results.</tt></dd></dl>
+ json - Use JSON format</tt></dd></dl>
<dl><dt><a name="Resource-liked"><strong>liked</strong></a> = method(self, **kwargs)</dt><dd><tt>Get people who liked an activity<br>
<br>
diff --git a/docs/dyn/buzz.v1.photoAlbums.html b/docs/dyn/buzz.v1.photoAlbums.html
index f7b1cd8..4ca4ec5 100644
--- a/docs/dyn/buzz.v1.photoAlbums.html
+++ b/docs/dyn/buzz.v1.photoAlbums.html
@@ -18,34 +18,34 @@
<br>
Args:<br>
albumId: string, ID of the album to delete. (required)<br>
+ userId: string, ID of the user being referenced. (required)<br>
+ hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
atom - Use Atom XML format<br>
- json - Use JSON format<br>
- userId: string, ID of the user being referenced. (required)<br>
- hl: string, Language code to limit language results.</tt></dd></dl>
+ json - Use JSON format</tt></dd></dl>
<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get a photo album<br>
<br>
Args:<br>
albumId: string, ID of the album to get. (required)<br>
+ userId: string, ID of the user being referenced. (required)<br>
+ hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
atom - Use Atom XML format<br>
- json - Use JSON format<br>
- userId: string, ID of the user being referenced. (required)<br>
- hl: string, Language code to limit language results.</tt></dd></dl>
+ json - Use JSON format</tt></dd></dl>
<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Create a photo album<br>
<br>
Args:<br>
body: object, The request body. (required)<br>
+ userId: string, ID of the user being referenced. (required)<br>
+ hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
atom - Use Atom XML format<br>
- json - Use JSON format<br>
- userId: string, ID of the user being referenced. (required)<br>
- hl: string, Language code to limit language results.</tt></dd></dl>
+ json - Use JSON format</tt></dd></dl>
<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>List a user's photo albums<br>
<br>
diff --git a/docs/dyn/buzz.v1.photos.html b/docs/dyn/buzz.v1.photos.html
index e9fc4b2..c46eba9 100644
--- a/docs/dyn/buzz.v1.photos.html
+++ b/docs/dyn/buzz.v1.photos.html
@@ -18,8 +18,8 @@
<br>
Args:<br>
photoId: string, ID of the photo to delete. (required)<br>
- userId: string, ID of the user being referenced. (required)<br>
albumId: string, ID of the album to which to photo belongs. (required)<br>
+ userId: string, ID of the user being referenced. (required)<br>
hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
@@ -29,9 +29,9 @@
<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get photo metadata<br>
<br>
Args:<br>
- photoId: string, ID of the album containing the photo. (required)<br>
+ photoId: string, ID of the photo for which to get metadata. (required)<br>
+ albumId: string, ID of the album containing the photo. (required)<br>
userId: string, ID of the user being referenced. (required)<br>
- albumId: string, ID of the photo for which to get metadata. (required)<br>
hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
@@ -42,8 +42,8 @@
<br>
Args:<br>
body: object, The request body. (required)<br>
- userId: string, ID of the user being referenced. (required)<br>
albumId: string, ID of the album to which to upload. (required)<br>
+ userId: string, ID of the user being referenced. (required)<br>
hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
@@ -54,8 +54,8 @@
<br>
Args:<br>
body: object, The request body. (required)<br>
- userId: string, ID of the user being referenced. (required)<br>
albumId: string, ID of the album to which to upload. (required)<br>
+ userId: string, ID of the user being referenced. (required)<br>
hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
Allowed values<br>
@@ -66,8 +66,8 @@
<br>
Args:<br>
c: string, A continuation token that allows pagination.<br>
- userId: string, ID of the user being referenced. (required)<br>
albumId: string, ID of the album for which to list photos. (required)<br>
+ userId: string, ID of the user being referenced. (required)<br>
max_results: integer, Maximum number of results to include.<br>
hl: string, Language code to limit language results.<br>
alt: string, Specifies an alternative representation type.<br>
diff --git a/docs/dyn/chromewebstore.v1.html b/docs/dyn/chromewebstore.v1.html
new file mode 100644
index 0000000..2045b5c
--- /dev/null
+++ b/docs/dyn/chromewebstore.v1.html
@@ -0,0 +1,28 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head><title>Python: class Resource</title>
+</head><body bgcolor="#f0f0f8">
+<p>
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
+<tr bgcolor="#ffc8d8">
+<td colspan=3 valign=bottom> <br>
+<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
+
+<tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td>
+<td colspan=2><tt>A class for interacting with a resource.<br> </tt></td></tr>
+<tr><td> </td>
+<td width="100%">Methods defined here:<br>
+<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
+
+<dl><dt><a name="Resource-licenses"><strong><a href="chromewebstore.v1.licenses.html">licenses</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
+
+<hr>
+Data descriptors defined here:<br>
+<dl><dt><strong>__dict__</strong></dt>
+<dd><tt>dictionary for instance variables (if defined)</tt></dd>
+</dl>
+<dl><dt><strong>__weakref__</strong></dt>
+<dd><tt>list of weak references to the object (if defined)</tt></dd>
+</dl>
+</td></tr></table>
+</body></html>
\ No newline at end of file
diff --git a/docs/dyn/chromewebstore.v1.licenses.html b/docs/dyn/chromewebstore.v1.licenses.html
new file mode 100644
index 0000000..af92a3c
--- /dev/null
+++ b/docs/dyn/chromewebstore.v1.licenses.html
@@ -0,0 +1,32 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head><title>Python: class Resource</title>
+</head><body bgcolor="#f0f0f8">
+<p>
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
+<tr bgcolor="#ffc8d8">
+<td colspan=3 valign=bottom> <br>
+<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
+
+<tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td>
+<td colspan=2><tt>A class for interacting with a resource.<br> </tt></td></tr>
+<tr><td> </td>
+<td width="100%">Methods defined here:<br>
+<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
+
+<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>A description of how to use this function<br>
+ <br>
+Args:<br>
+ userId: string, A parameter (required)<br>
+ appId: string, A parameter (required)</tt></dd></dl>
+
+<hr>
+Data descriptors defined here:<br>
+<dl><dt><strong>__dict__</strong></dt>
+<dd><tt>dictionary for instance variables (if defined)</tt></dd>
+</dl>
+<dl><dt><strong>__weakref__</strong></dt>
+<dd><tt>list of weak references to the object (if defined)</tt></dd>
+</dl>
+</td></tr></table>
+</body></html>
\ No newline at end of file
diff --git a/docs/dyn/customsearch.v1.cse.html b/docs/dyn/customsearch.v1.cse.html
index c783068..7cbc708 100644
--- a/docs/dyn/customsearch.v1.cse.html
+++ b/docs/dyn/customsearch.v1.cse.html
@@ -19,13 +19,13 @@
Args:<br>
sort: string, The sort expression to apply to the results<br>
num: string, Number of search results to return<br>
+ start: string, The index of the first result to return<br>
safe: string, Search safety level<br>
Allowed values<br>
high - Enables highest level of safe search filtering.<br>
medium - Enables moderate safe search filtering.<br>
off - Disables safe search filtering.<br>
q: string, Query (required)<br>
- start: string, The index of the first result to return<br>
cx: string, The custom search engine ID to scope this search query<br>
lr: string, The language restriction for the search results<br>
Allowed values<br>
diff --git a/docs/dyn/diacritize.v1.diacritize.corpus.html b/docs/dyn/diacritize.v1.diacritize.corpus.html
index be7ff78..9ed825c 100644
--- a/docs/dyn/diacritize.v1.diacritize.corpus.html
+++ b/docs/dyn/diacritize.v1.diacritize.corpus.html
@@ -18,8 +18,8 @@
<br>
Args:<br>
lang: string, Language of the message (required)<br>
- message: string, Message to be diacritized (required)<br>
- last_letter: boolean, Flag to indicate whether the last letter in a word should be diacritized or not (required)</tt></dd></dl>
+ last_letter: boolean, Flag to indicate whether the last letter in a word should be diacritized or not (required)<br>
+ message: string, Message to be diacritized (required)</tt></dd></dl>
<hr>
Data descriptors defined here:<br>
diff --git a/docs/dyn/moderator.v1.responses.html b/docs/dyn/moderator.v1.responses.html
index d5f7c7e..48a487a 100644
--- a/docs/dyn/moderator.v1.responses.html
+++ b/docs/dyn/moderator.v1.responses.html
@@ -18,9 +18,9 @@
<br>
Args:<br>
seriesId: integer, The decimal ID of the Series. (required)<br>
- body: object, The request body. (required)<br>
topicId: integer, The decimal ID of the Topic within the Series. (required)<br>
parentSubmissionId: integer, The decimal ID of the parent Submission within the Series. (required)<br>
+ body: object, The request body. (required)<br>
anonymous: boolean, Set to true to mark the new submission as anonymous.</tt></dd></dl>
<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>Lists or searches the responses for the specified submission within the specified series and returns the search results.<br>
diff --git a/docs/dyn/moderator.v1.series.submissions.html b/docs/dyn/moderator.v1.series.submissions.html
index d1ef85c..8dec541 100644
--- a/docs/dyn/moderator.v1.series.submissions.html
+++ b/docs/dyn/moderator.v1.series.submissions.html
@@ -19,6 +19,7 @@
Args:<br>
lang: string, The language code for the language the client prefers resuls in.<br>
seriesId: integer, The decimal ID of the Series. (required)<br>
+ includeVotes: boolean, Specifies whether to include the current user's vote<br>
author: string, Restricts the results to submissions by a specific author.<br>
sort: string, Sort order.<br>
max_results: integer, Maximum number of results to return.<br>
diff --git a/docs/dyn/moderator.v1.submissions.html b/docs/dyn/moderator.v1.submissions.html
index 4cc5493..622cc24 100644
--- a/docs/dyn/moderator.v1.submissions.html
+++ b/docs/dyn/moderator.v1.submissions.html
@@ -19,6 +19,7 @@
Args:<br>
lang: string, The language code for the language the client prefers resuls in.<br>
seriesId: integer, The decimal ID of the Series. (required)<br>
+ includeVotes: boolean, Specifies whether to include the current user's vote<br>
submissionId: integer, The decimal ID of the Submission within the Series. (required)</tt></dd></dl>
<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Inserts a new submission in the specified topic within the specified series.<br>
diff --git a/docs/dyn/moderator.v1.topics.submissions.html b/docs/dyn/moderator.v1.topics.submissions.html
index 064f595..8283e3c 100644
--- a/docs/dyn/moderator.v1.topics.submissions.html
+++ b/docs/dyn/moderator.v1.topics.submissions.html
@@ -17,14 +17,15 @@
<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>Searches the submissions for the specified topic within the specified series and returns the search results.<br>
<br>
Args:<br>
- sort: string, Sort order.<br>
seriesId: integer, The decimal ID of the Series. (required)<br>
- author: string, Restricts the results to submissions by a specific author.<br>
topicId: integer, The decimal ID of the Topic within the Series. (required)<br>
- q: string, Search query.<br>
+ includeVotes: boolean, Specifies whether to include the current user's vote<br>
+ author: string, Restricts the results to submissions by a specific author.<br>
+ sort: string, Sort order.<br>
max_results: integer, Maximum number of results to return.<br>
- hasAttachedVideo: boolean, Specifies whether to restrict to submissions that have videos attached.<br>
- start_index: integer, Index of the first result to be retrieved.</tt></dd></dl>
+ q: string, Search query.<br>
+ start_index: integer, Index of the first result to be retrieved.<br>
+ hasAttachedVideo: boolean, Specifies whether to restrict to submissions that have videos attached.</tt></dd></dl>
<hr>
Data descriptors defined here:<br>
diff --git a/docs/dyn/shopping.v1.products.html b/docs/dyn/shopping.v1.products.html
index 6ca32d7..aee9d2d 100644
--- a/docs/dyn/shopping.v1.products.html
+++ b/docs/dyn/shopping.v1.products.html
@@ -17,22 +17,22 @@
<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Returns a single product<br>
<br>
Args:<br>
- productIdType: string, Type of productId (required)<br>
- categories_include: string, Category specification<br>
- thumbnails: string, Thumbnail specification<br>
+ debug_searchResponse: boolean, Google Internal<br>
taxonomy: string, Merchant taxonomy<br>
+ recommendations_useGcsConfig: boolean, This parameter is currently ignored<br>
+ accountId: string, Merchant center account id (required)<br>
+ source: string, Query source (required)<br>
recommendations_include: string, Recommendation specification<br>
+ debug_enabled: boolean, Google Internal<br>
+ debug_searchRequest: boolean, Google Internal<br>
+ productId: string, Id of product (required)<br>
+ productIdType: string, Type of productId (required)<br>
debug_enableLogging: boolean, Google Internal<br>
recommendations_enabled: boolean, Whether to return recommendation information<br>
- debug_enabled: boolean, Google Internal<br>
- source: string, Query source (required)<br>
- debug_searchRequest: boolean, Google Internal<br>
categories_enabled: boolean, Whether to return category information<br>
- recommendations_useGcsConfig: boolean, This parameter is currently ignored<br>
- productId: string, Id of product (required)<br>
categories_useGcsConfig: boolean, This parameter is currently ignored<br>
- accountId: string, Merchant center account id (required)<br>
- debug_searchResponse: boolean, Google Internal</tt></dd></dl>
+ thumbnails: string, Thumbnail specification<br>
+ categories_include: string, Category specification</tt></dd></dl>
<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>Returns a list of products and content modules<br>
<br>
@@ -47,10 +47,8 @@
debug_rdcResponse: boolean, Google Internal<br>
facets_discover: string, Facets to discover<br>
startIndex: integer, Index (1-based) of first product to return<br>
- redirects_useGcsConfig: boolean, Whether to return redirect information as configured in the GCS account<br>
crowdBy: string, Crowding specification<br>
spelling_enabled: boolean, Whether to return spelling suggestions<br>
- sayt_enabled: boolean, Google Internal<br>
debug_enabled: boolean, Google Internal<br>
spelling_useGcsConfig: boolean, This parameter is currently ignored<br>
source: string, Query source (required)<br>
@@ -70,12 +68,14 @@
thumbnails: string, Image thumbnails specification<br>
language: string, Language restriction (BCP 47)<br>
currency: string, Currency restriction (ISO 4217)<br>
- country: string, Country restriction (ISO 3166)<br>
+ sayt_enabled: boolean, Google Internal<br>
rankBy: string, Ranking specification<br>
redirects_enabled: boolean, Whether to return redirect information<br>
restrictBy: string, Restriction specification<br>
q: string, Search query<br>
+ redirects_useGcsConfig: boolean, Whether to return redirect information as configured in the GCS account<br>
sayt_useGcsConfig: boolean, Google Internal<br>
+ country: string, Country restriction (ISO 3166)<br>
relatedQueries_useGcsConfig: boolean, This parameter is currently ignored<br>
promotions_useGcsConfig: boolean, Whether to return promotion information as configured in the GCS account</tt></dd></dl>
diff --git a/docs/dyn/translate.v2.detections.html b/docs/dyn/translate.v2.detections.html
new file mode 100644
index 0000000..59f5f59
--- /dev/null
+++ b/docs/dyn/translate.v2.detections.html
@@ -0,0 +1,31 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head><title>Python: class Resource</title>
+</head><body bgcolor="#f0f0f8">
+<p>
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
+<tr bgcolor="#ffc8d8">
+<td colspan=3 valign=bottom> <br>
+<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
+
+<tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td>
+<td colspan=2><tt>A class for interacting with a resource.<br> </tt></td></tr>
+<tr><td> </td>
+<td width="100%">Methods defined here:<br>
+<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
+
+<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>Detect the language of text.<br>
+ <br>
+Args:<br>
+ q: string, The text to detect (required) (repeated)</tt></dd></dl>
+
+<hr>
+Data descriptors defined here:<br>
+<dl><dt><strong>__dict__</strong></dt>
+<dd><tt>dictionary for instance variables (if defined)</tt></dd>
+</dl>
+<dl><dt><strong>__weakref__</strong></dt>
+<dd><tt>list of weak references to the object (if defined)</tt></dd>
+</dl>
+</td></tr></table>
+</body></html>
\ No newline at end of file
diff --git a/docs/dyn/translate.v2.html b/docs/dyn/translate.v2.html
index eb6500f..e834dff 100644
--- a/docs/dyn/translate.v2.html
+++ b/docs/dyn/translate.v2.html
@@ -14,6 +14,10 @@
<td width="100%">Methods defined here:<br>
<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
+<dl><dt><a name="Resource-detections"><strong><a href="translate.v2.detections.html">detections</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
+
+<dl><dt><a name="Resource-languages"><strong><a href="translate.v2.languages.html">languages</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
+
<dl><dt><a name="Resource-translations"><strong><a href="translate.v2.translations.html">translations</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
<hr>
diff --git a/docs/dyn/translate.v2.languages.html b/docs/dyn/translate.v2.languages.html
new file mode 100644
index 0000000..3ecb5cd
--- /dev/null
+++ b/docs/dyn/translate.v2.languages.html
@@ -0,0 +1,31 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head><title>Python: class Resource</title>
+</head><body bgcolor="#f0f0f8">
+<p>
+<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
+<tr bgcolor="#ffc8d8">
+<td colspan=3 valign=bottom> <br>
+<font color="#000000" face="helvetica, arial"><a name="Resource">class <strong>Resource</strong></a>(<a href="__builtin__.html#object">__builtin__.object</a>)</font></td></tr>
+
+<tr bgcolor="#ffc8d8"><td rowspan=2><tt> </tt></td>
+<td colspan=2><tt>A class for interacting with a resource.<br> </tt></td></tr>
+<tr><td> </td>
+<td width="100%">Methods defined here:<br>
+<dl><dt><a name="Resource-__init__"><strong>__init__</strong></a>(self)</dt></dl>
+
+<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>List the source/target languages supported by the API<br>
+ <br>
+Args:<br>
+ target: string, the language and collation in which the localized results should be returned</tt></dd></dl>
+
+<hr>
+Data descriptors defined here:<br>
+<dl><dt><strong>__dict__</strong></dt>
+<dd><tt>dictionary for instance variables (if defined)</tt></dd>
+</dl>
+<dl><dt><strong>__weakref__</strong></dt>
+<dd><tt>list of weak references to the object (if defined)</tt></dd>
+</dl>
+</td></tr></table>
+</body></html>
\ No newline at end of file
diff --git a/docs/dyn/translate.v2.translations.html b/docs/dyn/translate.v2.translations.html
index 84a708a..8dd749b 100644
--- a/docs/dyn/translate.v2.translations.html
+++ b/docs/dyn/translate.v2.translations.html
@@ -17,13 +17,13 @@
<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>Returns text translations from one language to another.<br>
<br>
Args:<br>
- q: string, The text to translate (required) (repeated)<br>
- source: string, The source language of the text<br>
target: string, The target language into which the text should be translated (required)<br>
format: string, The format of the text<br>
Allowed values<br>
html - Specifies the input is in HTML<br>
- text - Specifies the input is in plain textual format</tt></dd></dl>
+ text - Specifies the input is in plain textual format<br>
+ q: string, The text to translate (required) (repeated)<br>
+ source: string, The source language of the text</tt></dd></dl>
<hr>
Data descriptors defined here:<br>
diff --git a/docs/dyn/urlshortener.v1.url.html b/docs/dyn/urlshortener.v1.url.html
index 23a753d..47ec765 100644
--- a/docs/dyn/urlshortener.v1.url.html
+++ b/docs/dyn/urlshortener.v1.url.html
@@ -17,12 +17,12 @@
<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Expands a short URL or gets creation time and analytics.<br>
<br>
Args:<br>
- shortUrl: string, The short URL, including the protocol. (required)<br>
projection: string, Additional information to return.<br>
Allowed values<br>
ANALYTICS_CLICKS - Returns only click counts.<br>
ANALYTICS_TOP_STRINGS - Returns only top string counts.<br>
- FULL - Returns the creation timestamp and all available analytics.</tt></dd></dl>
+ FULL - Returns the creation timestamp and all available analytics.<br>
+ shortUrl: string, The short URL, including the protocol. (required)</tt></dd></dl>
<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Creates a new short URL.<br>
<br>
diff --git a/docs/httplib2.html b/docs/httplib2.html
index 944ec63..8be442d 100644
--- a/docs/httplib2.html
+++ b/docs/httplib2.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong>httplib2</strong></big></big> (version $Rev$)</font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/httplib2/__init__.py">/home/jcgregorio/projects/apiary/httplib2/__init__.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/httplib2/__init__.py">/home/jcgregorio/projects/apiclient-release/httplib2/__init__.py</a></font></td></tr></table>
<p></p>
<p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
diff --git a/docs/httplib2.socks.html b/docs/httplib2.socks.html
index cfcd67e..c06e9be 100644
--- a/docs/httplib2.socks.html
+++ b/docs/httplib2.socks.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="httplib2.html"><font color="#ffffff">httplib2</font></a>.socks</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/httplib2/socks.py">/home/jcgregorio/projects/apiary/httplib2/socks.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/httplib2/socks.py">/home/jcgregorio/projects/apiclient-release/httplib2/socks.py</a></font></td></tr></table>
<p><tt>SocksiPy - Python SOCKS module.<br>
Version 1.00<br>
<br>
diff --git a/docs/oauth2client.client.html b/docs/oauth2client.client.html
index 1693061..b00aba6 100644
--- a/docs/oauth2client.client.html
+++ b/docs/oauth2client.client.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="oauth2client.html"><font color="#ffffff">oauth2client</font></a>.client</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/oauth2client/client.py">/home/jcgregorio/projects/apiary/oauth2client/client.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/oauth2client/client.py">/home/jcgregorio/projects/apiclient-release/oauth2client/client.py</a></font></td></tr></table>
<p><tt>An OAuth 2.0 client<br>
<br>
Tools for interacting with OAuth 2.0 protected<br>
@@ -622,7 +622,7 @@
<dl><dt><a name="Storage-get"><strong>get</strong></a>(self)</dt><dd><tt>Retrieve credential.<br>
<br>
Returns:<br>
- apiclient.oauth.<a href="#Credentials">Credentials</a></tt></dd></dl>
+ oauth2client.client.<a href="#Credentials">Credentials</a></tt></dd></dl>
<dl><dt><a name="Storage-put"><strong>put</strong></a>(self, credentials)</dt><dd><tt>Write a credential.<br>
<br>
diff --git a/docs/oauth2client.django_orm.html b/docs/oauth2client.django_orm.html
index 437b1c8..e276c28 100644
--- a/docs/oauth2client.django_orm.html
+++ b/docs/oauth2client.django_orm.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="oauth2client.html"><font color="#ffffff">oauth2client</font></a>.django_orm</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient/oauth2client/django_orm.py">/usr/local/google/home/jcgregorio/projects/apiclient/oauth2client/django_orm.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/oauth2client/django_orm.py">/home/jcgregorio/projects/apiclient-release/oauth2client/django_orm.py</a></font></td></tr></table>
<p><tt>OAuth 2.0 utilities for Django.<br>
<br>
Utilities for using OAuth 2.0 in conjunction with<br>
@@ -62,9 +62,13 @@
Methods defined here:<br>
<dl><dt><a name="CredentialsField-contribute_to_class"><strong>contribute_to_class</strong></a>(self, cls, name)</dt></dl>
-<dl><dt><a name="CredentialsField-db_type"><strong>db_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="CredentialsField-db_type"><strong>db_type</strong></a> = inner(*args, **kwargs)</dt></dl>
-<dl><dt><a name="CredentialsField-get_db_prep_value"><strong>get_db_prep_value</strong></a>(self, value)</dt></dl>
+<dl><dt><a name="CredentialsField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="CredentialsField-get_db_prep_save"><strong>get_db_prep_save</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="CredentialsField-get_db_prep_value"><strong>get_db_prep_value</strong></a> = inner(*args, **kwargs)</dt></dl>
<dl><dt><a name="CredentialsField-to_python"><strong>to_python</strong></a>(self, value)</dt></dl>
@@ -79,10 +83,14 @@
<dl><dt><a name="CredentialsField-__deepcopy__"><strong>__deepcopy__</strong></a>(self, memodict)</dt></dl>
-<dl><dt><a name="CredentialsField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=<class django.db.models.fields.NOT_PROVIDED></font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>)</dt></dl>
+<dl><dt><a name="CredentialsField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=<class django.db.models.fields.NOT_PROVIDED></font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>, validators<font color="#909090">=[]</font>, error_messages<font color="#909090">=None</font>)</dt></dl>
<dl><dt><a name="CredentialsField-bind"><strong>bind</strong></a>(self, fieldmapping, original, bound_field_class)</dt></dl>
+<dl><dt><a name="CredentialsField-clean"><strong>clean</strong></a>(self, value, model_instance)</dt><dd><tt>Convert the value's type and run validation. Validation errors from to_python<br>
+and validate are propagated. The correct value is returned if no error is<br>
+raised.</tt></dd></dl>
+
<dl><dt><a name="CredentialsField-formfield"><strong>formfield</strong></a>(self, form_class<font color="#909090">=<class 'django.forms.fields.CharField'></font>, **kwargs)</dt><dd><tt>Returns a django.forms.<a href="django.db.models.fields.html#Field">Field</a> instance for this database <a href="django.db.models.fields.html#Field">Field</a>.</tt></dd></dl>
<dl><dt><a name="CredentialsField-get_attname"><strong>get_attname</strong></a>(self)</dt></dl>
@@ -96,26 +104,31 @@
<dl><dt><a name="CredentialsField-get_choices_default"><strong>get_choices_default</strong></a>(self)</dt></dl>
-<dl><dt><a name="CredentialsField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Returns field's value prepared for database lookup.</tt></dd></dl>
-
-<dl><dt><a name="CredentialsField-get_db_prep_save"><strong>get_db_prep_save</strong></a>(self, value)</dt><dd><tt>Returns field's value prepared for saving into a database.</tt></dd></dl>
-
<dl><dt><a name="CredentialsField-get_default"><strong>get_default</strong></a>(self)</dt><dd><tt>Returns the default value for this field.</tt></dd></dl>
<dl><dt><a name="CredentialsField-get_flatchoices"><strong>get_flatchoices</strong></a>(self, include_blank<font color="#909090">=True</font>, blank_choice<font color="#909090">=[('', '---------')]</font>)</dt><dd><tt>Returns flattened choices with a default blank choice included.</tt></dd></dl>
<dl><dt><a name="CredentialsField-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="CredentialsField-get_prep_lookup"><strong>get_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Perform preliminary non-db specific lookup checks and conversions</tt></dd></dl>
+
+<dl><dt><a name="CredentialsField-get_prep_value"><strong>get_prep_value</strong></a>(self, value)</dt><dd><tt>Perform preliminary non-db specific value checks and conversions.</tt></dd></dl>
+
<dl><dt><a name="CredentialsField-get_validator_unique_lookup_type"><strong>get_validator_unique_lookup_type</strong></a>(self)</dt></dl>
<dl><dt><a name="CredentialsField-has_default"><strong>has_default</strong></a>(self)</dt><dd><tt>Returns a boolean of whether this field has a default value.</tt></dd></dl>
<dl><dt><a name="CredentialsField-pre_save"><strong>pre_save</strong></a>(self, model_instance, add)</dt><dd><tt>Returns field's value just before saving.</tt></dd></dl>
+<dl><dt><a name="CredentialsField-run_validators"><strong>run_validators</strong></a>(self, value)</dt></dl>
+
<dl><dt><a name="CredentialsField-save_form_data"><strong>save_form_data</strong></a>(self, instance, data)</dt></dl>
<dl><dt><a name="CredentialsField-set_attributes_from_name"><strong>set_attributes_from_name</strong></a>(self, name)</dt></dl>
+<dl><dt><a name="CredentialsField-validate"><strong>validate</strong></a>(self, value, model_instance)</dt><dd><tt>Validates value and throws ValidationError. Subclasses should override<br>
+this to provide validation logic.</tt></dd></dl>
+
<dl><dt><a name="CredentialsField-value_from_object"><strong>value_from_object</strong></a>(self, obj)</dt><dd><tt>Returns the value of this field in the given model instance.</tt></dd></dl>
<dl><dt><a name="CredentialsField-value_to_string"><strong>value_to_string</strong></a>(self, obj)</dt><dd><tt>Returns a string value of this field from the passed obj.<br>
@@ -131,6 +144,8 @@
</dl>
<dl><dt><strong>choices</strong></dt>
</dl>
+<dl><dt><strong>description</strong></dt>
+</dl>
<dl><dt><strong>flatchoices</strong></dt>
<dd><tt>Flattened version of choices tuple.</tt></dd>
</dl>
@@ -142,6 +157,10 @@
<dl><dt><strong>creation_counter</strong> = 0</dl>
+<dl><dt><strong>default_error_messages</strong> = {'blank': <django.utils.functional.__proxy__ object>, 'invalid_choice': <django.utils.functional.__proxy__ object>, 'null': <django.utils.functional.__proxy__ object>}</dl>
+
+<dl><dt><strong>default_validators</strong> = []</dl>
+
<dl><dt><strong>empty_strings_allowed</strong> = True</dl>
</td></tr></table> <p>
@@ -160,9 +179,13 @@
Methods defined here:<br>
<dl><dt><a name="FlowField-contribute_to_class"><strong>contribute_to_class</strong></a>(self, cls, name)</dt></dl>
-<dl><dt><a name="FlowField-db_type"><strong>db_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="FlowField-db_type"><strong>db_type</strong></a> = inner(*args, **kwargs)</dt></dl>
-<dl><dt><a name="FlowField-get_db_prep_value"><strong>get_db_prep_value</strong></a>(self, value)</dt></dl>
+<dl><dt><a name="FlowField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="FlowField-get_db_prep_save"><strong>get_db_prep_save</strong></a> = inner(*args, **kwargs)</dt></dl>
+
+<dl><dt><a name="FlowField-get_db_prep_value"><strong>get_db_prep_value</strong></a> = inner(*args, **kwargs)</dt></dl>
<dl><dt><a name="FlowField-to_python"><strong>to_python</strong></a>(self, value)</dt></dl>
@@ -177,10 +200,14 @@
<dl><dt><a name="FlowField-__deepcopy__"><strong>__deepcopy__</strong></a>(self, memodict)</dt></dl>
-<dl><dt><a name="FlowField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=<class django.db.models.fields.NOT_PROVIDED></font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>)</dt></dl>
+<dl><dt><a name="FlowField-__init__"><strong>__init__</strong></a>(self, verbose_name<font color="#909090">=None</font>, name<font color="#909090">=None</font>, primary_key<font color="#909090">=False</font>, max_length<font color="#909090">=None</font>, unique<font color="#909090">=False</font>, blank<font color="#909090">=False</font>, null<font color="#909090">=False</font>, db_index<font color="#909090">=False</font>, rel<font color="#909090">=None</font>, default<font color="#909090">=<class django.db.models.fields.NOT_PROVIDED></font>, editable<font color="#909090">=True</font>, serialize<font color="#909090">=True</font>, unique_for_date<font color="#909090">=None</font>, unique_for_month<font color="#909090">=None</font>, unique_for_year<font color="#909090">=None</font>, choices<font color="#909090">=None</font>, help_text<font color="#909090">=''</font>, db_column<font color="#909090">=None</font>, db_tablespace<font color="#909090">=None</font>, auto_created<font color="#909090">=False</font>, validators<font color="#909090">=[]</font>, error_messages<font color="#909090">=None</font>)</dt></dl>
<dl><dt><a name="FlowField-bind"><strong>bind</strong></a>(self, fieldmapping, original, bound_field_class)</dt></dl>
+<dl><dt><a name="FlowField-clean"><strong>clean</strong></a>(self, value, model_instance)</dt><dd><tt>Convert the value's type and run validation. Validation errors from to_python<br>
+and validate are propagated. The correct value is returned if no error is<br>
+raised.</tt></dd></dl>
+
<dl><dt><a name="FlowField-formfield"><strong>formfield</strong></a>(self, form_class<font color="#909090">=<class 'django.forms.fields.CharField'></font>, **kwargs)</dt><dd><tt>Returns a django.forms.<a href="django.db.models.fields.html#Field">Field</a> instance for this database <a href="django.db.models.fields.html#Field">Field</a>.</tt></dd></dl>
<dl><dt><a name="FlowField-get_attname"><strong>get_attname</strong></a>(self)</dt></dl>
@@ -194,26 +221,31 @@
<dl><dt><a name="FlowField-get_choices_default"><strong>get_choices_default</strong></a>(self)</dt></dl>
-<dl><dt><a name="FlowField-get_db_prep_lookup"><strong>get_db_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Returns field's value prepared for database lookup.</tt></dd></dl>
-
-<dl><dt><a name="FlowField-get_db_prep_save"><strong>get_db_prep_save</strong></a>(self, value)</dt><dd><tt>Returns field's value prepared for saving into a database.</tt></dd></dl>
-
<dl><dt><a name="FlowField-get_default"><strong>get_default</strong></a>(self)</dt><dd><tt>Returns the default value for this field.</tt></dd></dl>
<dl><dt><a name="FlowField-get_flatchoices"><strong>get_flatchoices</strong></a>(self, include_blank<font color="#909090">=True</font>, blank_choice<font color="#909090">=[('', '---------')]</font>)</dt><dd><tt>Returns flattened choices with a default blank choice included.</tt></dd></dl>
<dl><dt><a name="FlowField-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
+<dl><dt><a name="FlowField-get_prep_lookup"><strong>get_prep_lookup</strong></a>(self, lookup_type, value)</dt><dd><tt>Perform preliminary non-db specific lookup checks and conversions</tt></dd></dl>
+
+<dl><dt><a name="FlowField-get_prep_value"><strong>get_prep_value</strong></a>(self, value)</dt><dd><tt>Perform preliminary non-db specific value checks and conversions.</tt></dd></dl>
+
<dl><dt><a name="FlowField-get_validator_unique_lookup_type"><strong>get_validator_unique_lookup_type</strong></a>(self)</dt></dl>
<dl><dt><a name="FlowField-has_default"><strong>has_default</strong></a>(self)</dt><dd><tt>Returns a boolean of whether this field has a default value.</tt></dd></dl>
<dl><dt><a name="FlowField-pre_save"><strong>pre_save</strong></a>(self, model_instance, add)</dt><dd><tt>Returns field's value just before saving.</tt></dd></dl>
+<dl><dt><a name="FlowField-run_validators"><strong>run_validators</strong></a>(self, value)</dt></dl>
+
<dl><dt><a name="FlowField-save_form_data"><strong>save_form_data</strong></a>(self, instance, data)</dt></dl>
<dl><dt><a name="FlowField-set_attributes_from_name"><strong>set_attributes_from_name</strong></a>(self, name)</dt></dl>
+<dl><dt><a name="FlowField-validate"><strong>validate</strong></a>(self, value, model_instance)</dt><dd><tt>Validates value and throws ValidationError. Subclasses should override<br>
+this to provide validation logic.</tt></dd></dl>
+
<dl><dt><a name="FlowField-value_from_object"><strong>value_from_object</strong></a>(self, obj)</dt><dd><tt>Returns the value of this field in the given model instance.</tt></dd></dl>
<dl><dt><a name="FlowField-value_to_string"><strong>value_to_string</strong></a>(self, obj)</dt><dd><tt>Returns a string value of this field from the passed obj.<br>
@@ -229,6 +261,8 @@
</dl>
<dl><dt><strong>choices</strong></dt>
</dl>
+<dl><dt><strong>description</strong></dt>
+</dl>
<dl><dt><strong>flatchoices</strong></dt>
<dd><tt>Flattened version of choices tuple.</tt></dd>
</dl>
@@ -240,6 +274,10 @@
<dl><dt><strong>creation_counter</strong> = 0</dl>
+<dl><dt><strong>default_error_messages</strong> = {'blank': <django.utils.functional.__proxy__ object>, 'invalid_choice': <django.utils.functional.__proxy__ object>, 'null': <django.utils.functional.__proxy__ object>}</dl>
+
+<dl><dt><strong>default_validators</strong> = []</dl>
+
<dl><dt><strong>empty_strings_allowed</strong> = True</dl>
</td></tr></table> <p>
diff --git a/docs/oauth2client.file.html b/docs/oauth2client.file.html
index 444a77a..22a4d01 100644
--- a/docs/oauth2client.file.html
+++ b/docs/oauth2client.file.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="oauth2client.html"><font color="#ffffff">oauth2client</font></a>.file</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/oauth2client/file.py">/home/jcgregorio/projects/apiary/oauth2client/file.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/oauth2client/file.py">/home/jcgregorio/projects/apiclient-release/oauth2client/file.py</a></font></td></tr></table>
<p><tt>Utilities for OAuth.<br>
<br>
Utilities for making it easier to work with OAuth 2.0<br>
diff --git a/docs/oauth2client.html b/docs/oauth2client.html
index a8f23e0..6e11166 100644
--- a/docs/oauth2client.html
+++ b/docs/oauth2client.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong>oauth2client</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/oauth2client/__init__.py">/home/jcgregorio/projects/apiary/oauth2client/__init__.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/oauth2client/__init__.py">/home/jcgregorio/projects/apiclient-release/oauth2client/__init__.py</a></font></td></tr></table>
<p></p>
<p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
@@ -21,6 +21,7 @@
<a href="oauth2client.client.html">client</a><br>
</td><td width="25%" valign=top><a href="oauth2client.django_orm.html">django_orm</a><br>
<a href="oauth2client.file.html">file</a><br>
-</td><td width="25%" valign=top><a href="oauth2client.tools.html">tools</a><br>
+</td><td width="25%" valign=top><a href="oauth2client.setup.html">setup</a><br>
+<a href="oauth2client.tools.html">tools</a><br>
</td><td width="25%" valign=top></td></tr></table></td></tr></table>
</body></html>
\ No newline at end of file
diff --git a/docs/oauth2client.tools.html b/docs/oauth2client.tools.html
index d1c97ec..ddd6b29 100644
--- a/docs/oauth2client.tools.html
+++ b/docs/oauth2client.tools.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong><a href="oauth2client.html"><font color="#ffffff">oauth2client</font></a>.tools</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/oauth2client/tools.py">/home/jcgregorio/projects/apiary/oauth2client/tools.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/oauth2client/tools.py">/home/jcgregorio/projects/apiclient-release/oauth2client/tools.py</a></font></td></tr></table>
<p><tt>Command-line tools for authenticating via OAuth 2.0<br>
<br>
Do the OAuth 2.0 Web Server dance for a command line application. Stores the<br>
diff --git a/docs/uritemplate.html b/docs/uritemplate.html
index 38598ae..3be8aeb 100644
--- a/docs/uritemplate.html
+++ b/docs/uritemplate.html
@@ -8,7 +8,7 @@
<td valign=bottom> <br>
<font color="#ffffff" face="helvetica, arial"> <br><big><big><strong>uritemplate</strong></big></big></font></td
><td align=right valign=bottom
-><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiary/uritemplate/__init__.py">/home/jcgregorio/projects/apiary/uritemplate/__init__.py</a></font></td></tr></table>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/home/jcgregorio/projects/apiclient-release/uritemplate/__init__.py">/home/jcgregorio/projects/apiclient-release/uritemplate/__init__.py</a></font></td></tr></table>
<p><tt># Early, and incomplete implementation of -04.<br>
#</tt></p>
<p>
diff --git a/oauth2client/client.py b/oauth2client/client.py
index c18a0ce..3c59980 100644
--- a/oauth2client/client.py
+++ b/oauth2client/client.py
@@ -1,4 +1,16 @@
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""An OAuth 2.0 client
diff --git a/oauth2client/django_orm.py b/oauth2client/django_orm.py
index 18a4a28..2f32faa 100644
--- a/oauth2client/django_orm.py
+++ b/oauth2client/django_orm.py
@@ -1,4 +1,16 @@
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""OAuth 2.0 utilities for Django.
diff --git a/oauth2client/file.py b/oauth2client/file.py
index b72e3c5..da666c4 100644
--- a/oauth2client/file.py
+++ b/oauth2client/file.py
@@ -1,4 +1,16 @@
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""Utilities for OAuth.
diff --git a/samples/api-python-client-doc/main.py b/samples/api-python-client-doc/main.py
index 1315c7f..df0209a 100755
--- a/samples/api-python-client-doc/main.py
+++ b/samples/api-python-client-doc/main.py
@@ -17,7 +17,6 @@
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
-
import httplib2
import inspect
import os
diff --git a/samples/buzz/buzz.py b/samples/buzz/buzz.py
index 74ee3a4..3d657b9 100644
--- a/samples/buzz/buzz.py
+++ b/samples/buzz/buzz.py
@@ -1,12 +1,36 @@
#!/usr/bin/python2.4
# -*- coding: utf-8 -*-
#
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""Simple command-line example for Buzz.
-Command-line application that retrieves the users
-latest content and then adds a new entry.
+Command-line application that retrieves the users latest content and then adds
+a new entry.
+
+Usage:
+ $ python buzz.py.py
+
+You can also get help on all the command-line flags the program understands
+by running:
+
+ $ python buzz.py.py --help
+
+To get detailed log output run:
+
+ $ python buzz.py.py --logging_level=DEBUG
"""
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
@@ -23,35 +47,55 @@
from oauth2client.tools import run
FLAGS = gflags.FLAGS
+
+# Set up a Flow object to be used if we need to authenticate. This
+# sample uses OAuth 2.0, and we set up the OAuth2WebServerFlow with
+# the information it needs to authenticate. Note that it is called
+# the Web Server Flow, but it can also handle the flow for native
+# applications <http://code.google.com/apis/accounts/docs/OAuth2.html#IA>
+# The client_id client_secret are copied from the Identity tab on
+# the Google APIs Console <http://code.google.com/apis/console>
FLOW = OAuth2WebServerFlow(
client_id='433807057907.apps.googleusercontent.com',
client_secret='jigtZpMApkRxncxikFpR+SFg',
scope='https://www.googleapis.com/auth/buzz',
user_agent='buzz-cmdline-sample/1.0')
+# The gflags module makes defining command-line options easy for
+# applications. Run this program with the '--help' argument to see
+# all the flags that it understands.
gflags.DEFINE_enum('logging_level', 'ERROR',
['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'],
'Set the level of logging detail.')
def main(argv):
+ # Let the gflags module process the command-line arguments
try:
argv = FLAGS(argv)
except gflags.FlagsError, e:
print '%s\\nUsage: %s ARGS\\n%s' % (e, argv[0], FLAGS)
sys.exit(1)
+ # Set the logging according to the command-line flag
logging.getLogger().setLevel(getattr(logging, FLAGS.logging_level))
+ # If the Credentials don't exist or are invalid run through the native client
+ # flow. The Storage object will ensure that if successful the good
+ # Credentials will get written back to a file.
storage = Storage('buzz.dat')
credentials = storage.get()
if credentials is None or credentials.invalid == True:
credentials = run(FLOW, storage)
+ # Create an httplib2.Http object to handle our HTTP requests and authorize it
+ # with our good Credentials.
http = httplib2.Http()
http = credentials.authorize(http)
- # Build the Buzz service
+ # Build a service object for interacting with the API. Visit
+ # the Google APIs Console <http://code.google.com/apis/console>
+ # to get a developerKey for your own application.
service = build("buzz", "v1", http=http,
developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
activities = service.activities()
diff --git a/samples/moderator/moderator.py b/samples/moderator/moderator.py
index be62a1f..f77534a 100644
--- a/samples/moderator/moderator.py
+++ b/samples/moderator/moderator.py
@@ -1,7 +1,19 @@
#!/usr/bin/python2.4
# -*- coding: utf-8 -*-
#
-# Copyright 2010 Google Inc. All Rights Reserved.
+# Copyright (C) 2010 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
"""Simple command-line example for Moderator.
@@ -82,8 +94,11 @@
http = httplib2.Http(cache=".cache")
http = credentials.authorize(http)
- # Build a service object for interacting with the API.
- service = build("moderator", "v1", http=http)
+ # Build a service object for interacting with the API. Visit
+ # the Google APIs Console <http://code.google.com/apis/console>
+ # to get a developerKey for your own application.
+ service = build("moderator", "v1", http=http,
+ developerKey="AIzaSyDRRpR3GS1F1_jKNNM9HCNd2wJQyPG3oN0")
# Create a new Moderator series.
series_body = {