Skip to content

Commit d01a8b6

Browse files
committed
Update to version 1.4. Includes py3 support.
1 parent 6d1f294 commit d01a8b6

File tree

42 files changed

+3717
-3605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3717
-3605
lines changed

CHANGELOG

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
v.next
1+
v1.4
2+
Version 1.4
23

34
Merge python3 branch! Massive thanks due to @pferate and @methane for doing
45
the heavy lifting.
56

7+
Make oauth2client.tools import gracefully if argparse isn't present.
8+
69
Change `flow.step2_exchange` to preserve the raw `id_token` in the
710
`token_response` field.
811

docs/epy/api-objects.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ oauth2client.tools oauth2client.tools-module.html
106106
oauth2client.tools.argparser oauth2client.tools-module.html#argparser
107107
oauth2client.tools._CLIENT_SECRETS_MESSAGE oauth2client.tools-module.html#_CLIENT_SECRETS_MESSAGE
108108
oauth2client.tools.message_if_missing oauth2client.tools-module.html#message_if_missing
109+
oauth2client.tools._CreateArgumentParser oauth2client.tools-module.html#_CreateArgumentParser
109110
oauth2client.tools.run oauth2client.tools-module.html#run
110111
oauth2client.tools.run_flow oauth2client.tools-module.html#run_flow
111112
oauth2client.util oauth2client.util-module.html
@@ -121,6 +122,7 @@ oauth2client.util.positional_parameters_enforcement oauth2client.util-module.htm
121122
oauth2client.util.POSITIONAL_SET oauth2client.util-module.html#POSITIONAL_SET
122123
oauth2client.xsrfutil oauth2client.xsrfutil-module.html
123124
oauth2client.xsrfutil.validate_token oauth2client.xsrfutil-module.html#validate_token
125+
oauth2client.xsrfutil._force_bytes oauth2client.xsrfutil-module.html#_force_bytes
124126
oauth2client.xsrfutil.DEFAULT_TIMEOUT_SECS oauth2client.xsrfutil-module.html#DEFAULT_TIMEOUT_SECS
125127
oauth2client.xsrfutil.DELIMITER oauth2client.xsrfutil-module.html#DELIMITER
126128
oauth2client.xsrfutil.generate_token oauth2client.xsrfutil-module.html#generate_token

docs/epy/oauth2client-module.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ <h1 class="epydoc">Package oauth2client</h1><p class="nomargin-top"><span class=
6262

6363
<hr />
6464
<div class="fields"> <p><strong>Version:</strong>
65-
1.3.2
65+
1.4
6666
</p>
6767
</div><!-- ==================== SUBMODULES ==================== -->
6868
<a name="section-Submodules"></a>
@@ -212,7 +212,7 @@ <h3 class="epydoc">GOOGLE_DEVICE_URI</h3>
212212
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
213213
<tr>
214214
<td align="left" class="footer">
215-
Generated by Epydoc 3.0.1 on Fri Oct 31 12:54:56 2014
215+
Generated by Epydoc 3.0.1 on Thu Nov 13 12:43:42 2014
216216
</td>
217217
<td align="right" class="footer">
218218
<a target="mainFrame" href="http://epydoc.sourceforge.net"

docs/epy/oauth2client-pysrc.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h1 class="epydoc">Source Code for <a href="oauth2client-module.html">Package oa
5757
<pre class="py-src">
5858
<a name="L1"></a><tt class="py-lineno"> 1</tt> <tt class="py-line"><tt class="py-docstring">"""Client library for using OAuth2, especially with Google APIs."""</tt> </tt>
5959
<a name="L2"></a><tt class="py-lineno"> 2</tt> <tt class="py-line"> </tt>
60-
<a name="L3"></a><tt class="py-lineno"> 3</tt> <tt class="py-line"><tt class="py-name">__version__</tt> <tt class="py-op">=</tt> <tt class="py-string">'1.3.2'</tt> </tt>
60+
<a name="L3"></a><tt class="py-lineno"> 3</tt> <tt class="py-line"><tt class="py-name">__version__</tt> <tt class="py-op">=</tt> <tt class="py-string">'1.4'</tt> </tt>
6161
<a name="L4"></a><tt class="py-lineno"> 4</tt> <tt class="py-line"> </tt>
6262
<a name="L5"></a><tt class="py-lineno"> 5</tt> <tt class="py-line"><tt id="link-0" class="py-name" targets="Variable oauth2client.GOOGLE_AUTH_URI=oauth2client-module.html#GOOGLE_AUTH_URI"><a title="oauth2client.GOOGLE_AUTH_URI" class="py-name" href="#" onclick="return doclink('link-0', 'GOOGLE_AUTH_URI', 'link-0');">GOOGLE_AUTH_URI</a></tt> <tt class="py-op">=</tt> <tt class="py-string">'https://accounts.google.com/o/oauth2/auth'</tt> </tt>
6363
<a name="L6"></a><tt class="py-lineno"> 6</tt> <tt class="py-line"><tt id="link-1" class="py-name" targets="Variable oauth2client.GOOGLE_DEVICE_URI=oauth2client-module.html#GOOGLE_DEVICE_URI"><a title="oauth2client.GOOGLE_DEVICE_URI" class="py-name" href="#" onclick="return doclink('link-1', 'GOOGLE_DEVICE_URI', 'link-1');">GOOGLE_DEVICE_URI</a></tt> <tt class="py-op">=</tt> <tt class="py-string">'https://accounts.google.com/o/oauth2/device/code'</tt> </tt>
@@ -96,7 +96,7 @@ <h1 class="epydoc">Source Code for <a href="oauth2client-module.html">Package oa
9696
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
9797
<tr>
9898
<td align="left" class="footer">
99-
Generated by Epydoc 3.0.1 on Fri Oct 31 12:54:58 2014
99+
Generated by Epydoc 3.0.1 on Thu Nov 13 12:43:44 2014
100100
</td>
101101
<td align="right" class="footer">
102102
<a target="mainFrame" href="http://epydoc.sourceforge.net"

docs/epy/oauth2client.appengine.AppAssertionCredentials-class.html

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,23 @@ <h1 class="epydoc">Class AppAssertionCredentials</h1><p class="nomargin-top"><sp
6666
<area shape="rect" id="node1_23" href="oauth2client.appengine.AppAssertionCredentials-class.html#create_scoped" title="Create a Credentials object for the given scopes." alt="" coords="31,596,215,615"/>
6767
<area shape="rect" id="node1" href="oauth2client.appengine.AppAssertionCredentials-class.html" title="Credentials object for App Engine Assertion Grants" alt="" coords="19,491,227,621"/>
6868
<area shape="rect" id="node2" href="oauth2client.client.AssertionCredentials-class.html" title="Abstract Credentials object used for OAuth 2.0 assertion grants." alt="" coords="32,429,213,472"/>
69-
<area shape="rect" id="node3_24" href="oauth2client.client.OAuth2Credentials-class.html#authorize" title="Authorize an httplib2.Http instance with these credentials." alt="" coords="17,124,228,143"/>
70-
<area shape="rect" id="node3_25" href="oauth2client.client.OAuth2Credentials-class.html#refresh" title="Forces a refresh of the access_token." alt="" coords="17,143,228,161"/>
71-
<area shape="rect" id="node3_26" href="oauth2client.client.OAuth2Credentials-class.html#revoke" title="Revokes a refresh_token and makes the credentials void." alt="" coords="17,161,228,180"/>
72-
<area shape="rect" id="node3_27" href="oauth2client.client.OAuth2Credentials-class.html#apply" title="Add the authorization to the headers." alt="" coords="17,180,228,199"/>
73-
<area shape="rect" id="node3_28" href="oauth2client.client.OAuth2Credentials-class.html#to_json" title="Creating a JSON representation of an instance of Credentials." alt="" coords="17,199,228,217"/>
74-
<area shape="rect" id="node3_29" href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired" title="True if the credential is expired or invalid." alt="" coords="17,217,228,236"/>
75-
<area shape="rect" id="node3_30" href="oauth2client.client.OAuth2Credentials-class.html#get_access_token" title="Return the access token and its expiration information." alt="" coords="17,236,228,255"/>
76-
<area shape="rect" id="node3_31" href="oauth2client.client.OAuth2Credentials-class.html#set_store" title="Set the Storage for the credential." alt="" coords="17,255,228,273"/>
77-
<area shape="rect" id="node3_32" href="oauth2client.client.OAuth2Credentials-class.html#__getstate__" title="Trim the state down to something that can be pickled." alt="" coords="17,273,228,292"/>
78-
<area shape="rect" id="node3_33" href="oauth2client.client.OAuth2Credentials-class.html#__setstate__" title="Reconstitute the state of the object from being pickled." alt="" coords="17,292,228,311"/>
79-
<area shape="rect" id="node3" href="oauth2client.client.OAuth2Credentials-class.html" title="Credentials object for OAuth 2.0." alt="" coords="5,93,240,317"/>
80-
<area shape="rect" id="node4_34" href="oauth2client.client.GoogleCredentials-class.html#get_application_default" title="Get the Application Default Credentials for the current environment." alt="" coords="20,367,224,385"/>
81-
<area shape="rect" id="node4_35" href="oauth2client.client.GoogleCredentials-class.html#from_stream" title="Create a Credentials object by reading the information from a given file." alt="" coords="20,385,224,404"/>
82-
<area shape="rect" id="node4" href="oauth2client.client.GoogleCredentials-class.html" title="Application Default Credentials for use in calling Google APIs." alt="" coords="7,336,235,411"/>
83-
<area shape="rect" id="node5_36" href="oauth2client.client.Credentials-class.html#NON_SERIALIZED_MEMBERS" title="oauth2client.client.Credentials.NON_SERIALIZED_MEMBERS" alt="" coords="25,28,220,47"/>
84-
<area shape="rect" id="node5_37" href="oauth2client.client.Credentials-class.html#new_from_json" title="Utility class method to instantiate a Credentials subclass from a JSON representation produced by to_json()." alt="" coords="25,49,220,68"/>
85-
<area shape="rect" id="node5" href="oauth2client.client.Credentials-class.html" title="Base class for all Credentials objects." alt="" coords="13,5,232,75"/>
69+
<area shape="rect" id="node3_24" href="oauth2client.client.GoogleCredentials-class.html#get_application_default" title="Get the Application Default Credentials for the current environment." alt="" coords="20,367,224,385"/>
70+
<area shape="rect" id="node3_25" href="oauth2client.client.GoogleCredentials-class.html#from_stream" title="Create a Credentials object by reading the information from a given file." alt="" coords="20,385,224,404"/>
71+
<area shape="rect" id="node3" href="oauth2client.client.GoogleCredentials-class.html" title="Application Default Credentials for use in calling Google APIs." alt="" coords="7,336,235,411"/>
72+
<area shape="rect" id="node4_26" href="oauth2client.client.Credentials-class.html#NON_SERIALIZED_MEMBERS" title="oauth2client.client.Credentials.NON_SERIALIZED_MEMBERS" alt="" coords="25,28,220,47"/>
73+
<area shape="rect" id="node4_27" href="oauth2client.client.Credentials-class.html#new_from_json" title="Utility class method to instantiate a Credentials subclass from a JSON representation produced by to_json()." alt="" coords="25,49,220,68"/>
74+
<area shape="rect" id="node4" href="oauth2client.client.Credentials-class.html" title="Base class for all Credentials objects." alt="" coords="13,5,232,75"/>
75+
<area shape="rect" id="node5_28" href="oauth2client.client.OAuth2Credentials-class.html#authorize" title="Authorize an httplib2.Http instance with these credentials." alt="" coords="17,124,228,143"/>
76+
<area shape="rect" id="node5_29" href="oauth2client.client.OAuth2Credentials-class.html#refresh" title="Forces a refresh of the access_token." alt="" coords="17,143,228,161"/>
77+
<area shape="rect" id="node5_30" href="oauth2client.client.OAuth2Credentials-class.html#revoke" title="Revokes a refresh_token and makes the credentials void." alt="" coords="17,161,228,180"/>
78+
<area shape="rect" id="node5_31" href="oauth2client.client.OAuth2Credentials-class.html#apply" title="Add the authorization to the headers." alt="" coords="17,180,228,199"/>
79+
<area shape="rect" id="node5_32" href="oauth2client.client.OAuth2Credentials-class.html#to_json" title="Creating a JSON representation of an instance of Credentials." alt="" coords="17,199,228,217"/>
80+
<area shape="rect" id="node5_33" href="oauth2client.client.OAuth2Credentials-class.html#access_token_expired" title="True if the credential is expired or invalid." alt="" coords="17,217,228,236"/>
81+
<area shape="rect" id="node5_34" href="oauth2client.client.OAuth2Credentials-class.html#get_access_token" title="Return the access token and its expiration information." alt="" coords="17,236,228,255"/>
82+
<area shape="rect" id="node5_35" href="oauth2client.client.OAuth2Credentials-class.html#set_store" title="Set the Storage for the credential." alt="" coords="17,255,228,273"/>
83+
<area shape="rect" id="node5_36" href="oauth2client.client.OAuth2Credentials-class.html#__getstate__" title="Trim the state down to something that can be pickled." alt="" coords="17,273,228,292"/>
84+
<area shape="rect" id="node5_37" href="oauth2client.client.OAuth2Credentials-class.html#__setstate__" title="Reconstitute the state of the object from being pickled." alt="" coords="17,292,228,311"/>
85+
<area shape="rect" id="node5" href="oauth2client.client.OAuth2Credentials-class.html" title="Credentials object for OAuth 2.0." alt="" coords="5,93,240,317"/>
8686
</map>
8787
<img src="uml_class_diagram_for_oauth2cl.gif" alt='' usemap="#uml_class_diagram_for_oauth2cl" ismap="ismap" class="graph-without-title" />
8888
</center>
@@ -617,7 +617,7 @@ <h3 class="epydoc"><span class="sig"><span class="sig-name">create_scoped</span>
617617
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
618618
<tr>
619619
<td align="left" class="footer">
620-
Generated by Epydoc 3.0.1 on Mon Sep 29 15:21:52 2014
620+
Generated by Epydoc 3.0.1 on Thu Nov 13 12:43:42 2014
621621
</td>
622622
<td align="right" class="footer">
623623
<a target="mainFrame" href="http://epydoc.sourceforge.net"

docs/epy/oauth2client.client-module.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ <h1 class="epydoc">Module client</h1><p class="nomargin-top"><span class="codeli
335335
</td><td class="summary">
336336
<table width="100%" cellpadding="0" cellspacing="0" border="0">
337337
<tr>
338-
<td><span class="summary-sig"><a name="_get_environment"></a><span class="summary-sig-name">_get_environment</span>(<span class="summary-sig-arg">urllib2_urlopen</span>=<span class="summary-sig-default">None</span>)</span><br />
338+
<td><span class="summary-sig"><a name="_get_environment"></a><span class="summary-sig-name">_get_environment</span>(<span class="summary-sig-arg">urlopen</span>=<span class="summary-sig-default">None</span>)</span><br />
339339
Detect the environment the code is being run on.</td>
340340
<td align="right" valign="top">
341341
<span class="codelink"><a href="oauth2client.client-pysrc.html#_get_environment">source&nbsp;code</a></span>
@@ -1325,7 +1325,7 @@ <h3 class="epydoc">AccessTokenInfo</h3>
13251325
<table border="0" cellpadding="0" cellspacing="0" width="100%%">
13261326
<tr>
13271327
<td align="left" class="footer">
1328-
Generated by Epydoc 3.0.1 on Mon Sep 29 15:21:51 2014
1328+
Generated by Epydoc 3.0.1 on Thu Nov 13 12:43:42 2014
13291329
</td>
13301330
<td align="right" class="footer">
13311331
<a target="mainFrame" href="http://epydoc.sourceforge.net"

0 commit comments

Comments
 (0)