Skip to content

Commit

Permalink
Merge branch 'working' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
EdLeafe committed Aug 21, 2013
2 parents 0d5a18b + 13cffb2 commit c5918ba
Show file tree
Hide file tree
Showing 35 changed files with 232 additions and 152 deletions.
21 changes: 18 additions & 3 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
# Release Notes for pyrax

###2013.08.21 - Version 1.4.11
- Fixed issue #161: different locales caused date parsing error.
- Fixed issue #166: passwords with non-ASCII characters were causing parsing
errors.
- Added setting identity_type to the sample code. GitHub #169.
- Fixed the way that default regions are handled. GitHub #165.
- Changed the example code to use only ASCII characters for server names.
GitHub #162.
- Changed container.get_object() to use the more efficient method in the
client. GitHub #160.
- Fixed broken internal link. GitHub #159.

###2013.08.06 - Version 1.4.10
- Fixed a performance issue when GETting a single object. GitHub #156.
- Fixed an issue with error response parsing. GitHub #151.
- Fixed trailing slash bug in identity. GitHub #154.
- Fixed a bug noticed in #69 in which the parameters to the swiftclient connection object were incorrect.
- Fixed a bug in download_object() that would throw an exception if the target directory already exists. GitHub #148.
- Added ability to specify content length when uploading an object to swift. GitHub #146.
- Fixed a bug noticed in #69 in which the parameters to the swiftclient
connection object were incorrect.
- Fixed a bug in download_object() that would throw an exception if the target
directory already exists. GitHub #148.
- Added ability to specify content length when uploading an object to swift.
GitHub #146.

###2013.07.23 - Version 1.4.9
- Fixed a bug introduced in the last release that prevented progressive
Expand Down
4 changes: 2 additions & 2 deletions docs/html/____init_____8py.html
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<tr><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacepyrax.html#a7f4dc3b1da79f21103723f78b910c8a5">cloud_blockstorage</a> = None</td></tr>
<tr><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacepyrax.html#acb0f91693d36d52270ed91fd2e919fcc">cloud_dns</a> = None</td></tr>
<tr><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacepyrax.html#af25ef81616c79ed5da4655185879259f">cloud_networks</a> = None</td></tr>
<tr><td class="memItemLeft" align="right" valign="top">string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacepyrax.html#abd0e51df0335ddf4a0ebf84b4e511b16">default_region</a> = &quot;DFW&quot;</td></tr>
<tr><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacepyrax.html#affa3c4afe67ff7c721e823ac8b67fa16">default_region</a> = None</td></tr>
<tr><td class="memItemLeft" align="right" valign="top">string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacepyrax.html#ab8005f4babffb239fd05dbb8c38551b7">default_encoding</a> = &quot;utf-8&quot;</td></tr>
<tr><td class="memItemLeft" align="right" valign="top">dictionary&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacepyrax.html#a9f379c663a918bd5beb1ed160f2b0c4d">settings</a> = {}</td></tr>
<tr><td class="memItemLeft" align="right" valign="top">string&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacepyrax.html#a9fecb0e59b3675027f29fc6870cf0d03">_environment</a> = &quot;default&quot;</td></tr>
Expand Down Expand Up @@ -186,7 +186,7 @@


<hr class="footer"/><address class="footer"><small>
Generated on Tue Jul 23 2013 13:59:44 for pyrax by &#160;<a href="http://www.doxygen.org/index.html">
Generated on Wed Aug 21 2013 07:38:01 for pyrax by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.7.6.1
</small></address>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a254d42e584df57805c2a190b073d28a4">delete_user</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#ac7a7efd7d064c324be145a0e88c25be8">expires</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td><code> [static]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a49192f7cc960a0aab538e014cf449225">expires</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#aa48069d87e240c6f35caed1b76e8cb4e">get_default_region</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#ab5a28d881fa99dd93c68bc1daf9e6710">get_extensions</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a5032718366de2e9b6b60077fdf882ce7">get_tenant</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#ab99f34de8275c77cf5ff09b1d7d0a04a">get_token</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
Expand Down Expand Up @@ -156,7 +157,7 @@


<hr class="footer"/><address class="footer"><small>
Generated on Tue Jul 23 2013 13:59:44 for pyrax by &#160;<a href="http://www.doxygen.org/index.html">
Generated on Wed Aug 21 2013 07:38:01 for pyrax by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.7.6.1
</small></address>
Expand Down
24 changes: 23 additions & 1 deletion docs/html/classpyrax_1_1base__identity_1_1BaseAuth.html
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@
<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Simple alias to self.token. <a href="#a1fbf2af4f60163ea873bf30e0980839e"></a><br/></td></tr>
<tr><td class="memItemLeft" align="right" valign="top">def&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a146f36df43eb5ac08c7c7b09bf50d6ed">auth_endpoint</a></td></tr>
<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Abstracts out the logic for connecting to different auth endpoints. <a href="#a146f36df43eb5ac08c7c7b09bf50d6ed"></a><br/></td></tr>
<tr><td class="memItemLeft" align="right" valign="top">def&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#aa48069d87e240c6f35caed1b76e8cb4e">get_default_region</a></td></tr>
<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">In cases where the region has not been specified, return the value to use. <a href="#aa48069d87e240c6f35caed1b76e8cb4e"></a><br/></td></tr>
<tr><td class="memItemLeft" align="right" valign="top">def&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a29ca4bc84123f642dc6cf191e2d61543">set_credentials</a></td></tr>
<tr><td class="mdescLeft">&#160;</td><td class="mdescRight">Sets the username and password directly. <a href="#a29ca4bc84123f642dc6cf191e2d61543"></a><br/></td></tr>
<tr><td class="memItemLeft" align="right" valign="top">def&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a31357d099c87594b661d674bb12a56c0">set_credential_file</a></td></tr>
Expand Down Expand Up @@ -547,6 +549,26 @@
<p>ADMIN ONLY. </p>
<p>Removes the user from the system. There is no 'undo' available, so you should be certain that the user specified is the user you wish to delete. </p>

</div>
</div>
<a class="anchor" id="aa48069d87e240c6f35caed1b76e8cb4e"></a><!-- doxytag: member="pyrax::base_identity::BaseAuth::get_default_region" ref="aa48069d87e240c6f35caed1b76e8cb4e" args="" -->
<div class="memitem">
<div class="memproto">
<table class="memname">
<tr>
<td class="memname">def <a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#aa48069d87e240c6f35caed1b76e8cb4e">get_default_region</a> </td>
<td>(</td>
<td class="paramtype">&#160;</td>
<td class="paramname"><em>self</em></td><td>)</td>
<td></td>
</tr>
</table>
</div>
<div class="memdoc">

<p>In cases where the region has not been specified, return the value to use. </p>
<p>Subclasses may use information in the service catalog to determine the appropriate default value. </p>

</div>
</div>
<a class="anchor" id="ab5a28d881fa99dd93c68bc1daf9e6710"></a><!-- doxytag: member="pyrax::base_identity::BaseAuth::get_extensions" ref="ab5a28d881fa99dd93c68bc1daf9e6710" args="" -->
Expand Down Expand Up @@ -1497,7 +1519,7 @@


<hr class="footer"/><address class="footer"><small>
Generated on Tue Jul 23 2013 13:59:44 for pyrax by &#160;<a href="http://www.doxygen.org/index.html">
Generated on Wed Aug 21 2013 07:38:01 for pyrax by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.7.6.1
</small></address>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a254d42e584df57805c2a190b073d28a4">delete_user</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#ac7a7efd7d064c324be145a0e88c25be8">expires</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td><code> [static]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a49192f7cc960a0aab538e014cf449225">expires</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#aa48069d87e240c6f35caed1b76e8cb4e">get_default_region</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#ab5a28d881fa99dd93c68bc1daf9e6710">get_extensions</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a5032718366de2e9b6b60077fdf882ce7">get_tenant</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#ab99f34de8275c77cf5ff09b1d7d0a04a">get_token</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
Expand Down Expand Up @@ -157,7 +158,7 @@


<hr class="footer"/><address class="footer"><small>
Generated on Tue Jul 23 2013 13:59:46 for pyrax by &#160;<a href="http://www.doxygen.org/index.html">
Generated on Wed Aug 21 2013 07:38:04 for pyrax by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.7.6.1
</small></address>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,14 @@
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a89a6ef6961d772a79cba6292b7edf926">check_token</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#afb882c0e80402ee17bf29c7af13d2a38">create_tenant</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#af18e8e2e2ba1d65bb30314133332044d">create_user</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html#abd0e51df0335ddf4a0ebf84b4e511b16">default_region</a></td><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html">RaxIdentity</a></td><td><code> [static]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a8ee048770360eebc35e35105ca6968f7">delete_tenant</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a254d42e584df57805c2a190b073d28a4">delete_user</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#ac7a7efd7d064c324be145a0e88c25be8">expires</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td><code> [static]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a49192f7cc960a0aab538e014cf449225">expires</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html#adf5de79a326a6b6b6eac3cba7e0b8cfb">find_user_by_id</a></td><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html">RaxIdentity</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html#ab0abba97256f91ebca2ded800fcf440d">find_user_by_name</a></td><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html">RaxIdentity</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#aa48069d87e240c6f35caed1b76e8cb4e">get_default_region</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#ab5a28d881fa99dd93c68bc1daf9e6710">get_extensions</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a5032718366de2e9b6b60077fdf882ce7">get_tenant</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#ab99f34de8275c77cf5ff09b1d7d0a04a">get_token</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
Expand Down Expand Up @@ -134,12 +136,10 @@
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a0eda5ccf1b845b56032e5dfb7e536642">tenant_name</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a623ef6987ef3bd185c07b28b13e46d34">token</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td><code> [static]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a87da3d8264af1c9427605148f20dd9c4">token</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html#a0463ddafa929788217a52ee8ecf10a5a">uk_auth_endpoint</a></td><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html">RaxIdentity</a></td><td><code> [static]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a143a677947f3597dc3cc3055a0eae66e">unauthenticate</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a25f2b401ee3068816e774d648abd83de">update_tenant</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html#a1a7d86495f2e95ce37b02894a6fe85df">update_user</a></td><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html">RaxIdentity</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a1a7d86495f2e95ce37b02894a6fe85df">pyrax::base_identity::BaseAuth.update_user</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html#abdf92c6a761ccb5139c8eaccfc09d775">us_auth_endpoint</a></td><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html">RaxIdentity</a></td><td><code> [static]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a5cc32e366c87c4cb49e4309b75f57d64">user</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html#a51351345c837229ad773526cbc137fdf">user_agent</a></td><td><a class="el" href="classpyrax_1_1base__identity_1_1BaseAuth.html">BaseAuth</a></td><td><code> [static]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html#a0adcbe0e0e6f64a29b1d205ede9632c1">username</a></td><td><a class="el" href="classpyrax_1_1identity_1_1rax__identity_1_1RaxIdentity.html">RaxIdentity</a></td><td></td></tr>
Expand All @@ -162,7 +162,7 @@


<hr class="footer"/><address class="footer"><small>
Generated on Tue Jul 23 2013 13:59:46 for pyrax by &#160;<a href="http://www.doxygen.org/index.html">
Generated on Wed Aug 21 2013 07:38:04 for pyrax by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.7.6.1
</small></address>
Expand Down
Loading

0 comments on commit c5918ba

Please sign in to comment.