Removing Buzz from comments in code
diff --git a/README b/README
index 35ba3da..bc3fd7c 100644
--- a/README
+++ b/README
@@ -1,5 +1,4 @@
-This is a prototype implementation of a client
-for discovery based APIs.
+This is python client library for Google's discovery based APIs.
Installation
@@ -9,24 +8,17 @@
$ python setup.py install
-If you want to do a "mock install" and simply extend your PYTHONPATH
-for the current shell to include this folder and the packages in it, do
-
- $ source setpath.sh
-
-from the root of the project directory.
-
Running
=======
After following the install directions (using setup.py or setpath.sh) you
-should be able to cd to samples/buzz and run buzz.py from there, which will use
-the apiclient library to retrieve the title of the most recent entry in Buzz
-and post a test message. The first time you run it you will be prompted to
-authorize the application to access your Buzz information.
+should be able to cd to samples/plus and run plus.py from there, which will use
+the apiclient library to retrieve a snippet of text from each entry in Google
+Plus. The first time you run it you will be prompted to authorize the
+application to access your plus information.
- $ python samples/buzz/buzz.py
+ $ python samples/plus/plus.py
Third Party Libraries
diff --git a/apiclient/http.py b/apiclient/http.py
index 081a4ed..d2a3a2f 100644
--- a/apiclient/http.py
+++ b/apiclient/http.py
@@ -136,10 +136,10 @@
response = '{"data": {"id": "tag:google.c...'
requestBuilder = RequestMockBuilder(
{
- 'chili.activities.get': (None, response),
+ 'plus.activities.get': (None, response),
}
)
- apiclient.discovery.build("buzz", "v1", requestBuilder=requestBuilder)
+ apiclient.discovery.build("plus", "v1", requestBuilder=requestBuilder)
Methods that you do not supply a response for will return a
200 OK with an empty string as the response content or raise an excpetion if
diff --git a/docs/apiclient.anyjson.html b/docs/apiclient.anyjson.html
index a2995a0..77e5b88 100644
--- a/docs/apiclient.anyjson.html
+++ b/docs/apiclient.anyjson.html
@@ -20,7 +20,7 @@
<font color="#ffffff" face="helvetica, arial"><big><strong>Modules</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="simplejson.html">simplejson</a><br>
+<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</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><p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#55aa55">
diff --git a/docs/apiclient.contrib.buzz.html b/docs/apiclient.contrib.buzz.html
deleted file mode 100644
index f8addd0..0000000
--- a/docs/apiclient.contrib.buzz.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: package apiclient.contrib.buzz</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>.<a href="apiclient.contrib.html"><font color="#ffffff">contrib</font></a>.buzz</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-release/apiclient/contrib/buzz/__init__.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/buzz/__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></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.contrib.html b/docs/apiclient.contrib.html
deleted file mode 100644
index c0e6977..0000000
--- a/docs/apiclient.contrib.html
+++ /dev/null
@@ -1,24 +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:/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/__init__.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/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><a href="apiclient.contrib.latitude.html"><strong>latitude</strong> (package)</a><br>
-</td><td width="25%" valign=top><a href="apiclient.contrib.moderator.html"><strong>moderator</strong> (package)</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/apiclient.contrib.latitude.html b/docs/apiclient.contrib.latitude.html
deleted file mode 100644
index 99bd5f3..0000000
--- a/docs/apiclient.contrib.latitude.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: package apiclient.contrib.latitude</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>.<a href="apiclient.contrib.html"><font color="#ffffff">contrib</font></a>.latitude</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-release/apiclient/contrib/latitude/__init__.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/latitude/__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></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.contrib.moderator.html b/docs/apiclient.contrib.moderator.html
deleted file mode 100644
index b3f5e80..0000000
--- a/docs/apiclient.contrib.moderator.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Python: package apiclient.contrib.moderator</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>.<a href="apiclient.contrib.html"><font color="#ffffff">contrib</font></a>.moderator</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-release/apiclient/contrib/moderator/__init__.py">/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/contrib/moderator/__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></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 e2a00bc..2cec87e 100644
--- a/docs/apiclient.discovery.html
+++ b/docs/apiclient.discovery.html
@@ -26,7 +26,7 @@
<a href="mimetypes.html">mimetypes</a><br>
<a href="os.html">os</a><br>
</td><td width="25%" valign=top><a href="re.html">re</a><br>
-<a href="simplejson.html">simplejson</a><br>
+<a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
<a href="uritemplate.html">uritemplate</a><br>
</td><td width="25%" valign=top><a href="urllib.html">urllib</a><br>
<a href="urlparse.html">urlparse</a><br>
diff --git a/docs/apiclient.errors.html b/docs/apiclient.errors.html
index 93ebd42..80b320f 100644
--- a/docs/apiclient.errors.html
+++ b/docs/apiclient.errors.html
@@ -20,7 +20,7 @@
<font color="#ffffff" face="helvetica, arial"><big><strong>Modules</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="simplejson.html">simplejson</a><br>
+<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</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><p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#ee77aa">
diff --git a/docs/apiclient.ext.django_orm.html b/docs/apiclient.ext.django_orm.html
index 91b9e70..e242bd7 100644
--- a/docs/apiclient.ext.django_orm.html
+++ b/docs/apiclient.ext.django_orm.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>.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>
+><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:/usr/local/google/home/jcgregorio/projects/apiclient-release/apiclient/ext/django_orm.py">/usr/local/google/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>
@@ -65,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>
@@ -82,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>
@@ -99,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>
@@ -134,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>
@@ -145,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>
@@ -163,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>
@@ -180,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>
@@ -197,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>
@@ -232,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>
@@ -243,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.http.html b/docs/apiclient.http.html
index 8dec4c6..d35f7fa 100644
--- a/docs/apiclient.http.html
+++ b/docs/apiclient.http.html
@@ -23,7 +23,7 @@
<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><a href="simplejson.html">simplejson</a><br>
+</td><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.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">
@@ -105,10 +105,10 @@
response = '{"data": {"id": "tag:google.c...'<br>
requestBuilder = <a href="#RequestMockBuilder">RequestMockBuilder</a>(<br>
{<br>
- 'chili.activities.get': (None, response),<br>
+ 'plus.activities.get': (None, response),<br>
}<br>
)<br>
- apiclient.discovery.build("buzz", "v1", requestBuilder=requestBuilder)<br>
+ apiclient.discovery.build("plus", "v1", requestBuilder=requestBuilder)<br>
<br>
Methods that you do not supply a response for will return a<br>
200 OK with an empty string as the response content or raise an excpetion if<br>
diff --git a/docs/apiclient.model.html b/docs/apiclient.model.html
index 6010090..b15b85d 100644
--- a/docs/apiclient.model.html
+++ b/docs/apiclient.model.html
@@ -24,7 +24,7 @@
<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="gflags.html">gflags</a><br>
</td><td width="25%" valign=top><a href="logging.html">logging</a><br>
-</td><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+</td><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
</td><td width="25%" valign=top><a href="urllib.html">urllib</a><br>
</td></tr></table></td></tr></table><p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
diff --git a/docs/apiclient.oauth.html b/docs/apiclient.oauth.html
index 5d76736..de6234c 100644
--- a/docs/apiclient.oauth.html
+++ b/docs/apiclient.oauth.html
@@ -23,7 +23,7 @@
<a href="httplib2.html">httplib2</a><br>
</td><td width="25%" valign=top><a href="logging.html">logging</a><br>
<a href="oauth2.html">oauth2</a><br>
-</td><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+</td><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
<a href="urllib.html">urllib</a><br>
</td><td width="25%" valign=top><a href="urlparse.html">urlparse</a><br>
</td></tr></table></td></tr></table><p>
diff --git a/docs/build.sh b/docs/build.sh
index 47367b1..1f922e7 100755
--- a/docs/build.sh
+++ b/docs/build.sh
@@ -22,11 +22,10 @@
# 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 python `which pydoc` -w
find ../oauth2client/ -name "*.py" | sed "s/\/__init__.py//" | sed "s/\.py//" | sed "s/^\.\.\///" | sed "s#/#.#g" | xargs python `which pydoc` -w
-find ../httplib2/ -name "*.py" | sed "s/\/__init__.py//" | sed "s/\.py//" | sed "s/^\.\.\///" | sed "s#/#.#g" | xargs python `which pydoc` -w
find ../uritemplate/ -name "*.py" | sed "s/\/__init__.py//" | sed "s/\.py//" | sed "s/^\.\.\///" | sed "s#/#.#g" | xargs python `which pydoc` -w
diff --git a/docs/dyn/analytics.v3.html b/docs/dyn/analytics.v3.html
index 0520383..6949bf9 100644
--- a/docs/dyn/analytics.v3.html
+++ b/docs/dyn/analytics.v3.html
@@ -16,6 +16,8 @@
<dl><dt><a name="Resource-management"><strong><a href="analytics.v3.management.html">management</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
+<dl><dt><a name="Resource-report"><strong><a href="analytics.v3.report.html">report</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>
diff --git a/docs/dyn/analytics.v3.report.html b/docs/dyn/analytics.v3.report.html
new file mode 100644
index 0000000..fb4d8cf
--- /dev/null
+++ b/docs/dyn/analytics.v3.report.html
@@ -0,0 +1,40 @@
+
+<!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>Returns Analytics report data for a profile.<br>
+ <br>
+Args:<br>
+ sort: string, A comma-separated list of dimensions or metrics that determine the sort order for the report data.<br>
+ end_date: string, End date for fetching report data. All requests should specify an end date formatted as YYYY-MM-DD. (required)<br>
+ dimensions: string, A comma-separated list of Analytics dimensions. E.g., 'ga:browser,ga:city'.<br>
+ ids: string, Unique table ID for retrieving report data. Table ID is of the form ga:XXXX, where XXXX is the Analytics profile ID. (required)<br>
+ metrics: string, A comma-separated list of Analytics metrics. E.g., 'ga:visits,ga:pageviews'. At least one metric must be specified to retrieve a valid Analytics report. (required)<br>
+ max_results: integer, The maximum number of entries to include in this feed.<br>
+ filters: string, A comma-separated list of dimension or metric filters to be applied to the report data.<br>
+ segment: string, An Analytics advanced segment to be applied to the report data.<br>
+ start_date: string, Start date for fetching report data. All requests should specify a start date formatted as YYYY-MM-DD. (required)<br>
+ start_index: integer, An index of the first entity to retrieve. Use this parameter as a pagination mechanism along with the max-results parameter.</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/buzz.v1.activities.html b/docs/dyn/buzz.v1.activities.html
deleted file mode 100644
index 60b5753..0000000
--- a/docs/dyn/buzz.v1.activities.html
+++ /dev/null
@@ -1,205 +0,0 @@
-
-<!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-count"><strong>count</strong></a> = method(self, **kwargs)</dt><dd><tt>Get a count of link shares<br>
- <br>
-Args:<br>
- url: string, URLs for which to get share counts. (repeated)<br>
- hl: string, Language code to limit language results.</tt></dd></dl>
-
-<dl><dt><a name="Resource-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Delete an activity<br>
- <br>
-Args:<br>
- userId: string, ID of the user whose post to delete. (required)<br>
- hl: string, Language code to limit language results.<br>
- scope: string, The collection to which the activity belongs. (required)<br>
- Allowed values<br>
- @liked - Activities liked by the user.<br>
- @muted - Activities muted by the user.<br>
- @self - Activities posted by the user.<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity to delete. (required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-extractPeopleFromSearch"><strong>extractPeopleFromSearch</strong></a> = method(self, **kwargs)</dt><dd><tt>Search for people by topic<br>
- <br>
-Args:<br>
- c: string, A continuation token that allows pagination.<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>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format</tt></dd></dl>
-
-<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get an activity<br>
- <br>
-Args:<br>
- postId: string, ID of the 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>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- max_comments: integer, Maximum number of comments to include.<br>
- max_liked: integer, Maximum number of likes to include.</tt></dd></dl>
-
-<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Create a new activity<br>
- <br>
-Args:<br>
- body: object, The request body.<br>
- media_body: string, The filename of the media request body.<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>
- preview: boolean, If true, only preview the action.</tt></dd></dl>
-
-<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>List activities<br>
- <br>
-Args:<br>
- c: string, A continuation token that allows pagination.<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>
- Allowed values<br>
- @comments - Limit to activities commented on by the user.<br>
- @consumption - Limit to activities to be consumed by the user.<br>
- @liked - Limit to activities liked by the user.<br>
- @public - Limit to public activities posted by the user.<br>
- @self - Limit to activities posted by the user.<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- max_comments: integer, Maximum number of comments to include.<br>
- max_liked: integer, Maximum number of likes to include.</tt></dd></dl>
-
-<dl><dt><a name="Resource-list_next"><strong>list_next</strong></a> = methodNext(self, previous)</dt><dd><tt>Retrieve the next page of results.<br>
- <br>
-Takes a single argument, 'body', which is the results<br>
-from the last call, and returns the next set of items<br>
-in the collection.<br>
- <br>
-Returns:<br>
- None if there are no more items in the collection.</tt></dd></dl>
-
-<dl><dt><a name="Resource-patch"><strong>patch</strong></a> = method(self, **kwargs)</dt><dd><tt>Update an activity. This method supports patch semantics.<br>
- <br>
-Args:<br>
- body: object, The request body. (required)<br>
- userId: string, ID of the user whose post to update. (required)<br>
- abuseType: string, A parameter<br>
- hl: string, Language code to limit language results.<br>
- scope: string, The collection to which the activity belongs. (required)<br>
- Allowed values<br>
- @abuse - Activities reported by the user.<br>
- @liked - Activities liked by the user.<br>
- @muted - Activities muted by the user.<br>
- @self - Activities posted by the user.<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity to update. (required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-search"><strong>search</strong></a> = method(self, **kwargs)</dt><dd><tt>Search for activities<br>
- <br>
-Args:<br>
- c: string, A continuation token that allows pagination.<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>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format</tt></dd></dl>
-
-<dl><dt><a name="Resource-search_next"><strong>search_next</strong></a> = methodNext(self, previous)</dt><dd><tt>Retrieve the next page of results.<br>
- <br>
-Takes a single argument, 'body', which is the results<br>
-from the last call, and returns the next set of items<br>
-in the collection.<br>
- <br>
-Returns:<br>
- None if there are no more items in the collection.</tt></dd></dl>
-
-<dl><dt><a name="Resource-track"><strong>track</strong></a> = method(self, **kwargs)</dt><dd><tt>Get real-time activity tracking information<br>
- <br>
-Args:<br>
- c: string, A continuation token that allows pagination.<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>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format</tt></dd></dl>
-
-<dl><dt><a name="Resource-update"><strong>update</strong></a> = method(self, **kwargs)</dt><dd><tt>Update an activity<br>
- <br>
-Args:<br>
- body: object, The request body. (required)<br>
- userId: string, ID of the user whose post to update. (required)<br>
- abuseType: string, A parameter<br>
- hl: string, Language code to limit language results.<br>
- scope: string, The collection to which the activity belongs. (required)<br>
- Allowed values<br>
- @abuse - Activities reported by the user.<br>
- @liked - Activities liked by the user.<br>
- @muted - Activities muted by the user.<br>
- @self - Activities posted by the user.<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity to update. (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/buzz.v1.comments.html b/docs/dyn/buzz.v1.comments.html
deleted file mode 100644
index 12aa3a4..0000000
--- a/docs/dyn/buzz.v1.comments.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-<!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-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Delete a comment<br>
- <br>
-Args:<br>
- userId: string, ID of the user being referenced. (required)<br>
- hl: string, Language code to limit language results.<br>
- commentId: string, ID of the comment being referenced. (required)<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity for which to delete the comment. (required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-get"><strong>get</strong></a> = method(self, **kwargs)</dt><dd><tt>Get a comment<br>
- <br>
-Args:<br>
- userId: string, ID of the user being referenced. (required)<br>
- hl: string, Language code to limit language results.<br>
- commentId: string, ID of the comment being referenced. (required)<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity for which to get comments. (required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Create a comment<br>
- <br>
-Args:<br>
- body: object, The request body. (required)<br>
- userId: string, ID of the user on whose behalf to comment. (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>
- postId: string, ID of the activity on which to comment. (required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>List comments<br>
- <br>
-Args:<br>
- c: string, A continuation token that allows pagination.<br>
- userId: string, ID of the user for whose post to get comments. (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 to which the activity belongs. (required)<br>
- Allowed values<br>
- @self - Activities posted by the user.<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity for which to get comments. (required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-patch"><strong>patch</strong></a> = method(self, **kwargs)</dt><dd><tt>Update a comment. This method supports patch semantics.<br>
- <br>
-Args:<br>
- body: object, The request body. (required)<br>
- userId: string, ID of the user being referenced. (required)<br>
- abuseType: string, A parameter<br>
- hl: string, Language code to limit language results.<br>
- commentId: string, ID of the comment being referenced. (required)<br>
- scope: string, The collection to which the activity belongs. (required)<br>
- Allowed values<br>
- @abuse - Comments reported by the user.<br>
- @self - Comments posted by the user.<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity for which to update the comment. (required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-update"><strong>update</strong></a> = method(self, **kwargs)</dt><dd><tt>Update a comment<br>
- <br>
-Args:<br>
- body: object, The request body. (required)<br>
- userId: string, ID of the user being referenced. (required)<br>
- abuseType: string, A parameter<br>
- hl: string, Language code to limit language results.<br>
- commentId: string, ID of the comment being referenced. (required)<br>
- scope: string, The collection to which the activity belongs. (required)<br>
- Allowed values<br>
- @abuse - Comments reported by the user.<br>
- @self - Comments posted by the user.<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity for which to update the comment. (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/buzz.v1.groups.html b/docs/dyn/buzz.v1.groups.html
deleted file mode 100644
index 0676e33..0000000
--- a/docs/dyn/buzz.v1.groups.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-<!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-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>
- 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>
- 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</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>
-Args:<br>
- c: string, A continuation token that allows pagination.<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>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format</tt></dd></dl>
-
-<dl><dt><a name="Resource-list_next"><strong>list_next</strong></a> = methodNext(self, previous)</dt><dd><tt>Retrieve the next page of results.<br>
- <br>
-Takes a single argument, 'body', which is the results<br>
-from the last call, and returns the next set of items<br>
-in the collection.<br>
- <br>
-Returns:<br>
- None if there are no more items in the collection.</tt></dd></dl>
-
-<dl><dt><a name="Resource-patch"><strong>patch</strong></a> = method(self, **kwargs)</dt><dd><tt>Update a group. This method supports patch semantics.<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>
- groupId: string, ID of the group to update. (required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-update"><strong>update</strong></a> = method(self, **kwargs)</dt><dd><tt>Update 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>
- groupId: string, ID of the group to update. (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/buzz.v1.html b/docs/dyn/buzz.v1.html
deleted file mode 100644
index 334b0e2..0000000
--- a/docs/dyn/buzz.v1.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<!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-activities"><strong><a href="buzz.v1.activities.html">activities</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-comments"><strong><a href="buzz.v1.comments.html">comments</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-groups"><strong><a href="buzz.v1.groups.html">groups</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-people"><strong><a href="buzz.v1.people.html">people</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-photoAlbums"><strong><a href="buzz.v1.photoAlbums.html">photoAlbums</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-photos"><strong><a href="buzz.v1.photos.html">photos</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
-
-<dl><dt><a name="Resource-related"><strong><a href="buzz.v1.related.html">related</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/buzz.v1.people.html b/docs/dyn/buzz.v1.people.html
deleted file mode 100644
index 2aa47da..0000000
--- a/docs/dyn/buzz.v1.people.html
+++ /dev/null
@@ -1,142 +0,0 @@
-
-<!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-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Remove a person from a group<br>
- <br>
-Args:<br>
- personId: string, ID of the person to remove from the group. (required)<br>
- userId: string, ID of the owner of the group. (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>
- groupId: string, ID of the group from which to remove the person. (required)</tt></dd></dl>
-
-<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</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>
-Args:<br>
- c: string, A continuation token that allows pagination.<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, A parameter (required)<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity that was liked. (required)<br>
- groupId: string, A parameter (required)<br>
- Allowed values<br>
- @liked - People who liked this activity.</tt></dd></dl>
-
-<dl><dt><a name="Resource-liked_next"><strong>liked_next</strong></a> = methodNext(self, previous)</dt><dd><tt>Retrieve the next page of results.<br>
- <br>
-Takes a single argument, 'body', which is the results<br>
-from the last call, and returns the next set of items<br>
-in the collection.<br>
- <br>
-Returns:<br>
- None if there are no more items in the collection.</tt></dd></dl>
-
-<dl><dt><a name="Resource-list"><strong>list</strong></a> = method(self, **kwargs)</dt><dd><tt>Get people in a group<br>
- <br>
-Args:<br>
- c: string, A continuation token that allows pagination.<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>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- groupId: string, ID of the group for which to list users. (required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-patch"><strong>patch</strong></a> = method(self, **kwargs)</dt><dd><tt>Add a person to a group. This method supports patch semantics.<br>
- <br>
-Args:<br>
- body: object, The request body. (required)<br>
- personId: string, ID of the person to add to the group. (required)<br>
- userId: string, ID of the owner of the group. (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>
- groupId: string, ID of the group to which to add the person. (required)</tt></dd></dl>
-
-<dl><dt><a name="Resource-reshared"><strong>reshared</strong></a> = method(self, **kwargs)</dt><dd><tt>Get people who reshared an activity<br>
- <br>
-Args:<br>
- c: string, A continuation token that allows pagination.<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, A parameter (required)<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity that was reshared. (required)<br>
- groupId: string, A parameter (required)<br>
- Allowed values<br>
- @reshared - People who reshared this activity.</tt></dd></dl>
-
-<dl><dt><a name="Resource-search"><strong>search</strong></a> = method(self, **kwargs)</dt><dd><tt>Search for people<br>
- <br>
-Args:<br>
- c: string, A continuation token that allows pagination.<br>
- q: string, Full-text search query string.<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>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format</tt></dd></dl>
-
-<dl><dt><a name="Resource-update"><strong>update</strong></a> = method(self, **kwargs)</dt><dd><tt>Add a person to a group<br>
- <br>
-Args:<br>
- body: object, The request body. (required)<br>
- personId: string, ID of the person to add to the group. (required)<br>
- userId: string, ID of the owner of the group. (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>
- groupId: string, ID of the group to which to add the person. (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/buzz.v1.photoAlbums.html b/docs/dyn/buzz.v1.photoAlbums.html
deleted file mode 100644
index 4ca4ec5..0000000
--- a/docs/dyn/buzz.v1.photoAlbums.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-<!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-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Delete a photo album<br>
- <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</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</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</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>
-Args:<br>
- c: string, A continuation token that allows pagination.<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 albums to list. (required)<br>
- Allowed values<br>
- @self - Albums posted by the user.<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format</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/buzz.v1.photos.html b/docs/dyn/buzz.v1.photos.html
deleted file mode 100644
index 847cc6e..0000000
--- a/docs/dyn/buzz.v1.photos.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-<!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-delete"><strong>delete</strong></a> = method(self, **kwargs)</dt><dd><tt>Delete a photo<br>
- <br>
-Args:<br>
- photoId: string, ID of the photo to delete. (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>
- atom - Use Atom XML format<br>
- json - Use JSON format</tt></dd></dl>
-
-<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 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>
- 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</tt></dd></dl>
-
-<dl><dt><a name="Resource-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Upload a photo to an album<br>
- <br>
-Args:<br>
- body: object, The request body.<br>
- media_body: string, The filename of the media request body.<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>
- atom - Use Atom XML format<br>
- json - Use JSON format</tt></dd></dl>
-
-<dl><dt><a name="Resource-insert2"><strong>insert2</strong></a> = method(self, **kwargs)</dt><dd><tt>Upload a photo to an album<br>
- <br>
-Args:<br>
- body: object, The request body.<br>
- media_body: string, The filename of the media request body.<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>
- atom - Use Atom XML format<br>
- json - Use JSON format</tt></dd></dl>
-
-<dl><dt><a name="Resource-listByAlbum"><strong>listByAlbum</strong></a> = method(self, **kwargs)</dt><dd><tt>List photos in an album<br>
- <br>
-Args:<br>
- c: string, A continuation token that allows pagination.<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>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format</tt></dd></dl>
-
-<dl><dt><a name="Resource-listByScope"><strong>listByScope</strong></a> = method(self, **kwargs)</dt><dd><tt>Get a user's photos<br>
- <br>
-Args:<br>
- c: string, A continuation token that allows pagination.<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 photos to list. (required)<br>
- Allowed values<br>
- @recent - Recent photos uploaded by the user.<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format</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/buzz.v1.related.html b/docs/dyn/buzz.v1.related.html
deleted file mode 100644
index 258682a..0000000
--- a/docs/dyn/buzz.v1.related.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<!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>Get related links for an activity<br>
- <br>
-Args:<br>
- userId: string, ID of the user being referenced. (required)<br>
- hl: string, Language code to limit language results.<br>
- scope: string, The collection to which the activity belongs. (required)<br>
- Allowed values<br>
- @self - Activities posted by the user.<br>
- alt: string, Specifies an alternative representation type.<br>
- Allowed values<br>
- atom - Use Atom XML format<br>
- json - Use JSON format<br>
- postId: string, ID of the activity to which to get related links. (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/orkut.v2.html b/docs/dyn/orkut.v2.html
index a3a1738..28ef8bc 100644
--- a/docs/dyn/orkut.v2.html
+++ b/docs/dyn/orkut.v2.html
@@ -26,6 +26,8 @@
<dl><dt><a name="Resource-counters"><strong><a href="orkut.v2.counters.html">counters</a></strong></a> = methodResource(self)</dt><dd><tt>A collection resource.</tt></dd></dl>
+<dl><dt><a name="Resource-scraps"><strong><a href="orkut.v2.scraps.html">scraps</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>
diff --git a/docs/dyn/orkut.v2.scraps.html b/docs/dyn/orkut.v2.scraps.html
new file mode 100644
index 0000000..15a00e7
--- /dev/null
+++ b/docs/dyn/orkut.v2.scraps.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-insert"><strong>insert</strong></a> = method(self, **kwargs)</dt><dd><tt>Creates a new scrap.<br>
+ <br>
+Args:<br>
+ body: object, The request body. (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/plus.v1.activities.html b/docs/dyn/plus.v1.activities.html
index 8efeda3..8aa998e 100644
--- a/docs/dyn/plus.v1.activities.html
+++ b/docs/dyn/plus.v1.activities.html
@@ -52,9 +52,10 @@
Allowed values<br>
best - Sort activities by relevance to the user, most relevant first.<br>
recent - Sort activities by published date, most recent first.<br>
+ language: string, Specify the preferred language to search with. See Language Codes for available values.<br>
pageToken: string, The continuation token, used to page through large result sets. To get the next page of results, set this parameter to the value of "nextPageToken" from the previous response. This token may be of any length.<br>
maxResults: integer, The maximum number of activities to include in the response, used for paging. For any response, the actual number returned may be less than the specified maxResults.<br>
- query: string, Full-text search query string.</tt></dd></dl>
+ query: string, Full-text search query string. (required)</tt></dd></dl>
<dl><dt><a name="Resource-search_next"><strong>search_next</strong></a> = methodNext(self, previous_request, previous_response)</dt><dd><tt>Retrieves the next page of results.<br>
<br>
diff --git a/docs/dyn/plus.v1.people.html b/docs/dyn/plus.v1.people.html
index 9627350..1c0d759 100644
--- a/docs/dyn/plus.v1.people.html
+++ b/docs/dyn/plus.v1.people.html
@@ -43,9 +43,10 @@
<dl><dt><a name="Resource-search"><strong>search</strong></a> = method(self, **kwargs)</dt><dd><tt>Search all public profiles.<br>
<br>
Args:<br>
+ language: string, Specify the preferred language to search with. See Language Codes for available values.<br>
pageToken: string, The continuation token, used to page through large result sets. To get the next page of results, set this parameter to the value of "nextPageToken" from the previous response. This token may be of any length.<br>
maxResults: integer, The maximum number of people to include in the response, used for paging. For any response, the actual number returned may be less than the specified maxResults.<br>
- query: string, Full-text search query string.</tt></dd></dl>
+ query: string, Full-text search query string. (required)</tt></dd></dl>
<dl><dt><a name="Resource-search_next"><strong>search_next</strong></a> = methodNext(self, previous_request, previous_response)</dt><dd><tt>Retrieves the next page of results.<br>
<br>
diff --git a/docs/dyn/shopping.v1.products.html b/docs/dyn/shopping.v1.products.html
index 55d04f7..fd874fb 100644
--- a/docs/dyn/shopping.v1.products.html
+++ b/docs/dyn/shopping.v1.products.html
@@ -47,13 +47,11 @@
debug_rdcRequest: boolean, Google Internal<br>
taxonomy: string, Taxonomy name<br>
promotions_enabled: boolean, Whether to return promotion information<br>
- shelfSpaceAds_enabled: boolean, Whether to return shelf space ads<br>
debug_rdcResponse: boolean, Google Internal<br>
productFields: string, Google Internal<br>
channels: string, Channels specification<br>
facets_discover: string, Facets to discover<br>
startIndex: integer, Index (1-based) of first product to return<br>
- attributeFilter: string, Comma separated list of attributes to return<br>
crowdBy: string, Crowding specification<br>
spelling_enabled: boolean, Whether to return spelling suggestions<br>
debug_enabled: boolean, Google Internal<br>
@@ -62,7 +60,7 @@
useCase: string, One of CommerceSearchUseCase, ShoppingApiUseCase<br>
debug_geocodeResponse: boolean, Google Internal<br>
location: string, Location used to determine tax and shipping<br>
- categories_include: string, Category specification<br>
+ maxVariants: integer, Maximum number of variant results to return per result<br>
debug_searchRequest: boolean, Google Internal<br>
relatedQueries_enabled: boolean, Whether to return related queries<br>
facets_useGcsConfig: boolean, Whether to return facet information as configured in the GCS account<br>
@@ -71,8 +69,7 @@
debug_enableLogging: boolean, Google Internal<br>
maxResults: integer, Maximum number of results to return<br>
categories_enabled: boolean, Whether to return category information<br>
- shelfSpaceAds_useGcsConfig: boolean, This parameter is currently ignored<br>
- shelfSpaceAds_maxResults: integer, The maximum number of shelf space ads to return<br>
+ attributeFilter: string, Comma separated list of attributes to return<br>
categories_useGcsConfig: boolean, This parameter is currently ignored<br>
minAvailability: string, A parameter<br>
Allowed values<br>
@@ -81,7 +78,7 @@
outOfStock - Out of stock, limited availability and in stock products will be returned<br>
unknown - All products will be returned<br>
facets_include: string, Facets to include (applies when useGcsConfig == false)<br>
- thumbnails: string, Image thumbnails specification<br>
+ categories_include: string, Category specification<br>
language: string, Language restriction (BCP 47)<br>
currency: string, Currency restriction (ISO 4217)<br>
sayt_enabled: boolean, Google Internal<br>
@@ -94,7 +91,8 @@
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<br>
- plusOne: string, +1 rendering specification.</tt></dd></dl>
+ plusOne: string, +1 rendering specification.<br>
+ thumbnails: string, Image thumbnails specification</tt></dd></dl>
<hr>
Data descriptors defined here:<br>
diff --git a/docs/fakesettings.py b/docs/fakesettings.py
deleted file mode 100644
index 565d2e5..0000000
--- a/docs/fakesettings.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# Django settings for django_sample project.
-import os
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
- # ('Your Name', 'your_email@domain.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = 'database.sqlite3'
-DATABASE_USER = ''
-DATABASE_PASSWORD = ''
-DATABASE_HOST = ''
-DATABASE_PORT = ''
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/New_York'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash if there is a path component (optional in other cases).
-# Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = ''
-
-# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
-# trailing slash.
-# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '_=9hq-$t_uv1ckf&s!y2$9g$1dm*6p1cl%*!^mg=7gr)!zj32d'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.load_template_source',
- 'django.template.loaders.app_directories.load_template_source',
-# 'django.template.loaders.eggs.load_template_source',
-)
-
-MIDDLEWARE_CLASSES = (
- 'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
-)
-
-ROOT_URLCONF = 'django_sample.urls'
-
-TEMPLATE_DIRS = (
- # Put strings here, like "/home/html/django_templates"
- # Always use forward slashes, even on Windows.
- # Don't forget to use absolute paths, not relative paths.
- os.path.join(os.path.dirname(__file__), 'templates')
-)
-
-INSTALLED_APPS = (
- 'django.contrib.admin',
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.sites',
- 'django_sample.buzz'
-)
diff --git a/docs/oauth2client.client.html b/docs/oauth2client.client.html
index e8a5152..5a0f5d6 100644
--- a/docs/oauth2client.client.html
+++ b/docs/oauth2client.client.html
@@ -24,7 +24,7 @@
<a href="datetime.html">datetime</a><br>
</td><td width="25%" valign=top><a href="httplib2.html">httplib2</a><br>
<a href="logging.html">logging</a><br>
-<a href="simplejson.html">simplejson</a><br>
+<a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
</td><td width="25%" valign=top><a href="sys.html">sys</a><br>
<a href="urllib.html">urllib</a><br>
<a href="urlparse.html">urlparse</a><br>
diff --git a/docs/oauth2client.clientsecrets.html b/docs/oauth2client.clientsecrets.html
index cc438e5..c4100ce 100644
--- a/docs/oauth2client.clientsecrets.html
+++ b/docs/oauth2client.clientsecrets.html
@@ -20,7 +20,7 @@
<font color="#ffffff" face="helvetica, arial"><big><strong>Modules</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="simplejson.html">simplejson</a><br>
+<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</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><p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#ee77aa">
diff --git a/docs/oauth2client.django_orm.html b/docs/oauth2client.django_orm.html
index 19fb474..ba85510 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:/usr/local/google/home/jcgregorio/projects/apiclient-release/oauth2client/django_orm.py">/usr/local/google/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,15 @@
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, connection<font color="#909090">=None</font>)</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-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
<dl><dt><a name="CredentialsField-to_python"><strong>to_python</strong></a>(self, value)</dt></dl>
@@ -79,10 +85,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,15 +106,13 @@
<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>
@@ -112,10 +120,15 @@
<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,15 @@
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, connection<font color="#909090">=None</font>)</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-get_internal_type"><strong>get_internal_type</strong></a>(self)</dt></dl>
<dl><dt><a name="FlowField-to_python"><strong>to_python</strong></a>(self, value)</dt></dl>
@@ -177,10 +202,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,15 +223,13 @@
<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>
@@ -210,10 +237,15 @@
<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>
@@ -271,12 +309,12 @@
key_value: string, key value for the entity that has the credentials<br>
property_name: string, name of the property that is an CredentialsProperty</tt></dd></dl>
-<dl><dt><a name="Storage-get"><strong>get</strong></a>(self)</dt><dd><tt>Retrieve Credential from datastore.<br>
+<dl><dt><a name="Storage-locked_get"><strong>locked_get</strong></a>(self)</dt><dd><tt>Retrieve Credential from datastore.<br>
<br>
Returns:<br>
oauth2client.Credentials</tt></dd></dl>
-<dl><dt><a name="Storage-put"><strong>put</strong></a>(self, credentials)</dt><dd><tt>Write a Credentials to the datastore.<br>
+<dl><dt><a name="Storage-locked_put"><strong>locked_put</strong></a>(self, credentials)</dt><dd><tt>Write a Credentials to the datastore.<br>
<br>
Args:<br>
credentials: Credentials, the credentials to store.</tt></dd></dl>
@@ -287,14 +325,14 @@
<br>
This lock is not reentrant.</tt></dd></dl>
-<dl><dt><a name="Storage-locked_get"><strong>locked_get</strong></a>(self)</dt><dd><tt>Retrieve credential.<br>
+<dl><dt><a name="Storage-get"><strong>get</strong></a>(self)</dt><dd><tt>Retrieve credential.<br>
<br>
-The <a href="#Storage">Storage</a> lock must be held when this is called.<br>
+The <a href="#Storage">Storage</a> lock must *not* be held when this is called.<br>
<br>
Returns:<br>
oauth2client.client.Credentials</tt></dd></dl>
-<dl><dt><a name="Storage-locked_put"><strong>locked_put</strong></a>(self, credentials)</dt><dd><tt>Write a credential.<br>
+<dl><dt><a name="Storage-put"><strong>put</strong></a>(self, credentials)</dt><dd><tt>Write a credential.<br>
<br>
The <a href="#Storage">Storage</a> lock must be held when this is called.<br>
<br>
diff --git a/docs/oauth2client.file.html b/docs/oauth2client.file.html
index 4a5bd55..6ca5460 100644
--- a/docs/oauth2client.file.html
+++ b/docs/oauth2client.file.html
@@ -20,7 +20,7 @@
<font color="#ffffff" face="helvetica, arial"><big><strong>Modules</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="simplejson.html">simplejson</a><br>
+<td width="100%"><table width="100%" summary="list"><tr><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
</td><td width="25%" valign=top><a href="threading.html">threading</a><br>
</td><td width="25%" valign=top></td><td width="25%" valign=top></td></tr></table></td></tr></table><p>
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="section">
diff --git a/docs/oauth2client.multistore_file.html b/docs/oauth2client.multistore_file.html
index 4cfcf47..468d904 100644
--- a/docs/oauth2client.multistore_file.html
+++ b/docs/oauth2client.multistore_file.html
@@ -47,7 +47,7 @@
<a href="fcntl.html">fcntl</a><br>
</td><td width="25%" valign=top><a href="logging.html">logging</a><br>
<a href="os.html">os</a><br>
-</td><td width="25%" valign=top><a href="simplejson.html">simplejson</a><br>
+</td><td width="25%" valign=top><a href="django.utils.simplejson.html">django.utils.simplejson</a><br>
<a href="threading.html">threading</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">
diff --git a/oauth2client/appengine.py b/oauth2client/appengine.py
index 1bc2aaa..db7817a 100644
--- a/oauth2client/appengine.py
+++ b/oauth2client/appengine.py
@@ -289,7 +289,7 @@
decorator = OAuth2Decorator(
client_id='837...ent.com',
client_secret='Qh...wwI',
- scope='https://www.googleapis.com/auth/buzz')
+ scope='https://www.googleapis.com/auth/plus')
class MainHandler(webapp.RequestHandler):
@@ -446,7 +446,7 @@
decorator = OAuth2DecoratorFromClientSecrets(
os.path.join(os.path.dirname(__file__), 'client_secrets.json')
- scope='https://www.googleapis.com/auth/buzz')
+ scope='https://www.googleapis.com/auth/plus')
class MainHandler(webapp.RequestHandler):
diff --git a/samples/appengine/apiclient b/samples/appengine/apiclient
deleted file mode 120000
index 22e4c9c..0000000
--- a/samples/appengine/apiclient
+++ /dev/null
@@ -1 +0,0 @@
-../../apiclient/
\ No newline at end of file
diff --git a/samples/appengine/gflags.py b/samples/appengine/gflags.py
deleted file mode 120000
index 5a2ff94..0000000
--- a/samples/appengine/gflags.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags.py
\ No newline at end of file
diff --git a/samples/appengine/gflags_validators.py b/samples/appengine/gflags_validators.py
deleted file mode 120000
index 25d8ce8..0000000
--- a/samples/appengine/gflags_validators.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags_validators.py
\ No newline at end of file
diff --git a/samples/appengine/httplib2 b/samples/appengine/httplib2
deleted file mode 120000
index 488ae9f..0000000
--- a/samples/appengine/httplib2
+++ /dev/null
@@ -1 +0,0 @@
-../../httplib2/
\ No newline at end of file
diff --git a/samples/appengine/oauth2 b/samples/appengine/oauth2
deleted file mode 120000
index af104cc..0000000
--- a/samples/appengine/oauth2
+++ /dev/null
@@ -1 +0,0 @@
-../../oauth2
\ No newline at end of file
diff --git a/samples/appengine/oauth2client b/samples/appengine/oauth2client
deleted file mode 120000
index 9013119..0000000
--- a/samples/appengine/oauth2client
+++ /dev/null
@@ -1 +0,0 @@
-../../oauth2client/
\ No newline at end of file
diff --git a/samples/appengine/uritemplate b/samples/appengine/uritemplate
deleted file mode 120000
index ce92dcb..0000000
--- a/samples/appengine/uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-../../uritemplate/
\ No newline at end of file
diff --git a/samples/appengine_with_robots/apiclient b/samples/appengine_with_robots/apiclient
deleted file mode 120000
index 24fe0bc..0000000
--- a/samples/appengine_with_robots/apiclient
+++ /dev/null
@@ -1 +0,0 @@
-../appengine/apiclient
\ No newline at end of file
diff --git a/samples/appengine_with_robots/gflags.py b/samples/appengine_with_robots/gflags.py
deleted file mode 120000
index 5a2ff94..0000000
--- a/samples/appengine_with_robots/gflags.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags.py
\ No newline at end of file
diff --git a/samples/appengine_with_robots/gflags_validators.py b/samples/appengine_with_robots/gflags_validators.py
deleted file mode 120000
index 25d8ce8..0000000
--- a/samples/appengine_with_robots/gflags_validators.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags_validators.py
\ No newline at end of file
diff --git a/samples/appengine_with_robots/httplib2 b/samples/appengine_with_robots/httplib2
deleted file mode 120000
index 4cd2774..0000000
--- a/samples/appengine_with_robots/httplib2
+++ /dev/null
@@ -1 +0,0 @@
-../appengine/httplib2
\ No newline at end of file
diff --git a/samples/appengine_with_robots/oauth2 b/samples/appengine_with_robots/oauth2
deleted file mode 120000
index ee61c25..0000000
--- a/samples/appengine_with_robots/oauth2
+++ /dev/null
@@ -1 +0,0 @@
-../appengine/oauth2
\ No newline at end of file
diff --git a/samples/appengine_with_robots/oauth2client b/samples/appengine_with_robots/oauth2client
deleted file mode 120000
index 9013119..0000000
--- a/samples/appengine_with_robots/oauth2client
+++ /dev/null
@@ -1 +0,0 @@
-../../oauth2client/
\ No newline at end of file
diff --git a/samples/appengine_with_robots/uritemplate b/samples/appengine_with_robots/uritemplate
deleted file mode 120000
index 1c98e41..0000000
--- a/samples/appengine_with_robots/uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-../appengine/uritemplate
\ No newline at end of file
diff --git a/samples/django_sample/buzz/__init__.py b/samples/django_sample/plus/__init__.py
similarity index 100%
rename from samples/django_sample/buzz/__init__.py
rename to samples/django_sample/plus/__init__.py
diff --git a/samples/django_sample/buzz/models.py b/samples/django_sample/plus/models.py
similarity index 100%
rename from samples/django_sample/buzz/models.py
rename to samples/django_sample/plus/models.py
diff --git a/samples/django_sample/buzz/tests.py b/samples/django_sample/plus/tests.py
similarity index 100%
rename from samples/django_sample/buzz/tests.py
rename to samples/django_sample/plus/tests.py
diff --git a/samples/django_sample/buzz/views.py b/samples/django_sample/plus/views.py
similarity index 70%
rename from samples/django_sample/buzz/views.py
rename to samples/django_sample/plus/views.py
index c942aaf..8cc5838 100644
--- a/samples/django_sample/buzz/views.py
+++ b/samples/django_sample/plus/views.py
@@ -8,14 +8,14 @@
from oauth2client.django_orm import Storage
from oauth2client.client import OAuth2WebServerFlow
-from django_sample.buzz.models import CredentialsModel
-from django_sample.buzz.models import FlowModel
+from django_sample.plus.models import CredentialsModel
+from django_sample.plus.models import FlowModel
from apiclient.discovery import build
from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response
-STEP2_URI = 'http://localhost:8000/auth_return'
+STEP2_URI = 'http://localhost:8000/oauth2callback'
@login_required
@@ -24,10 +24,10 @@
credential = storage.get()
if credential is None or credential.invalid == True:
flow = OAuth2WebServerFlow(
- client_id='837647042410.apps.googleusercontent.com',
- client_secret='+SWwMCL9d8gWtzPRa1lXw5R8',
- scope='https://www.googleapis.com/auth/buzz',
- user_agent='buzz-django-sample/1.0',
+ client_id='[[Insert Client ID here.]]',
+ client_secret='[[Insert Client Secret here.]]',
+ scope='https://www.googleapis.com/auth/plus.me',
+ user_agent='plus-django-sample/1.0',
)
authorize_url = flow.step1_get_authorize_url(STEP2_URI)
@@ -37,13 +37,13 @@
else:
http = httplib2.Http()
http = credential.authorize(http)
- service = build("buzz", "v1", http=http)
+ service = build("plus", "v1", http=http)
activities = service.activities()
- activitylist = activities.list(scope='@consumption',
- userId='@me').execute()
+ activitylist = activities.list(collection='public',
+ userId='me').execute()
logging.info(activitylist)
- return render_to_response('buzz/welcome.html', {
+ return render_to_response('plus/welcome.html', {
'activitylist': activitylist,
})
diff --git a/samples/django_sample/settings.py b/samples/django_sample/settings.py
index d0d7c7e..df10f0a 100644
--- a/samples/django_sample/settings.py
+++ b/samples/django_sample/settings.py
@@ -80,5 +80,5 @@
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
- 'django_sample.buzz'
+ 'django_sample.plus'
)
diff --git a/samples/django_sample/templates/buzz/welcome.html b/samples/django_sample/templates/buzz/welcome.html
deleted file mode 100644
index 07e8027..0000000
--- a/samples/django_sample/templates/buzz/welcome.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<html>
- <head>
- <title>Buzz Stuff</title>
- <style type=text/css>
- td { vertical-align: top; padding: 0.5em }
- img { border:0 }
- </style>
- </head>
- <body>
- <table border=0>
- {% for item in activitylist.items %}
- <tr valign=top>
- <td>
- {% if item.actor.thumbnailUrl %}
- <a href="{{ item.actor.profileUrl }}">
- <img src="{{ item.actor.thumbnailUrl }}">
- </a>
- {% endif %}
- <br>
- <a href="{{ item.actor.profileUrl }}">{{ item.actor.name }}</a></td>
- <td>
- {{ item.object.content|safe }}
- </td>
- <td>
- <a href="{{ item.object.links.alternate.0.href }}"><img
- src="/static/go.png"></a>
- </td>
- </tr>
- {% endfor %}
- </table>
- </body>
-</html>
diff --git a/samples/django_sample/templates/buzz/login.html b/samples/django_sample/templates/plus/login.html
similarity index 100%
rename from samples/django_sample/templates/buzz/login.html
rename to samples/django_sample/templates/plus/login.html
diff --git a/samples/django_sample/templates/plus/welcome.html b/samples/django_sample/templates/plus/welcome.html
new file mode 100644
index 0000000..d43698b
--- /dev/null
+++ b/samples/django_sample/templates/plus/welcome.html
@@ -0,0 +1,17 @@
+
+<html>
+ <head>
+ <title>Your Google+ Activity</title>
+ <style type=text/css>
+ td { vertical-align: top; padding: 0.5em }
+ img { border:0 }
+ </style>
+ </head>
+ <body>
+ <table border=1>
+ {% for item in activitylist.items %}
+ <tr><td>{{ item.object.content|safe }}</td></tr>
+ {% endfor %}
+ </table>
+ </body>
+</html>
diff --git a/samples/django_sample/urls.py b/samples/django_sample/urls.py
index aeba620..4c67ff2 100644
--- a/samples/django_sample/urls.py
+++ b/samples/django_sample/urls.py
@@ -7,8 +7,8 @@
urlpatterns = patterns('',
# Example:
- (r'^$', 'django_sample.buzz.views.index'),
- (r'^auth_return', 'django_sample.buzz.views.auth_return'),
+ (r'^$', 'django_sample.plus.views.index'),
+ (r'^oauth2callback', 'django_sample.plus.views.auth_return'),
# Uncomment the admin/doc line below and add 'django.contrib.admindocs'
# to INSTALLED_APPS to enable admin documentation:
@@ -17,7 +17,7 @@
# Uncomment the next line to enable the admin:
(r'^admin/', include(admin.site.urls)),
(r'^accounts/login/$', 'django.contrib.auth.views.login',
- {'template_name': 'buzz/login.html'}),
+ {'template_name': 'plus/login.html'}),
(r'^static/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': os.path.join(os.path.dirname(__file__), 'static')
diff --git a/samples/src/buzz.py b/samples/src/buzz.py
deleted file mode 100644
index 10451e2..0000000
--- a/samples/src/buzz.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# version: v1
-# scope: https://www.googleapis.com/auth/buzz
-# title: Simple command-line sample for Buzz.
-# description: Command-line application that retrieves the users latest content and then adds a new entry.
-
- activities = service.activities()
-
- # Retrieve the first two activities
- activitylist = activities.list(
- max_results='2', scope='@self', userId='@me').execute()
- print "Retrieved the first two activities"
-
- # Retrieve the next two activities
- if activitylist:
- activitylist = activities.list_next(activitylist).execute()
- print "Retrieved the next two activities"
-
- # Add a new activity
- new_activity_body = {
- 'title': 'Testing insert',
- 'object': {
- 'content':
- u'Just a short note to show that insert is working. ☄',
- 'type': 'note'}
- }
- activity = activities.insert(userId='@me', body=new_activity_body).execute()
- print "Added a new activity"
-
- activitylist = activities.list(
- max_results='2', scope='@self', userId='@me').execute()
-
- # Add a comment to that activity
- comment_body = {
- "content": "This is a comment"
- }
- item = activitylist['items'][0]
- comment = service.comments().insert(
- userId=item['actor']['id'], postId=item['id'], body=comment_body
- ).execute()
- print 'Added a comment to the new activity'
- pprint.pprint(comment)
diff --git a/samples/tasks_appengine/apiclient b/samples/tasks_appengine/apiclient
deleted file mode 120000
index 22e4c9c..0000000
--- a/samples/tasks_appengine/apiclient
+++ /dev/null
@@ -1 +0,0 @@
-../../apiclient/
\ No newline at end of file
diff --git a/samples/tasks_appengine/gflags.py b/samples/tasks_appengine/gflags.py
deleted file mode 120000
index 5a2ff94..0000000
--- a/samples/tasks_appengine/gflags.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags.py
\ No newline at end of file
diff --git a/samples/tasks_appengine/gflags_validators.py b/samples/tasks_appengine/gflags_validators.py
deleted file mode 120000
index 25d8ce8..0000000
--- a/samples/tasks_appengine/gflags_validators.py
+++ /dev/null
@@ -1 +0,0 @@
-../../gflags_validators.py
\ No newline at end of file
diff --git a/samples/tasks_appengine/httplib2 b/samples/tasks_appengine/httplib2
deleted file mode 120000
index 488ae9f..0000000
--- a/samples/tasks_appengine/httplib2
+++ /dev/null
@@ -1 +0,0 @@
-../../httplib2/
\ No newline at end of file
diff --git a/samples/tasks_appengine/oauth2client b/samples/tasks_appengine/oauth2client
deleted file mode 120000
index 9013119..0000000
--- a/samples/tasks_appengine/oauth2client
+++ /dev/null
@@ -1 +0,0 @@
-../../oauth2client/
\ No newline at end of file
diff --git a/samples/tasks_appengine/uritemplate b/samples/tasks_appengine/uritemplate
deleted file mode 120000
index ce92dcb..0000000
--- a/samples/tasks_appengine/uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-../../uritemplate/
\ No newline at end of file
diff --git a/samples/threadqueue/main.py b/samples/threadqueue/main.py
index 6ccea7c..817de59 100644
--- a/samples/threadqueue/main.py
+++ b/samples/threadqueue/main.py
@@ -35,7 +35,6 @@
# A list of URLs to shorten.
BULK = [
- "https://code.google.com/apis/buzz/",
"https://code.google.com/apis/moderator/",
"https://code.google.com/apis/latitude/",
"https://code.google.com/apis/urlshortener/",
diff --git a/setup.py b/setup.py
index 219f673..33130e9 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,6 @@
'oauth2client',
'apiclient.ext',
'apiclient.contrib',
- 'apiclient.contrib.buzz',
'apiclient.contrib.latitude',
'apiclient.contrib.moderator',
'uritemplate',
@@ -46,7 +45,7 @@
install_requires.append('simplejson')
long_desc = """The Google API Client for Python is a client library for
-accessing the Buzz, Moderator, and Latitude APIs."""
+accessing the Plus, Moderator, and many other Google APIs."""
setup(name="google-api-python-client",
version="1.0beta6",