1.7.6.1
diff --git a/docs/html/classes.html b/docs/html/classes.html
index 7c207543..c7efa75e 100644
--- a/docs/html/classes.html
+++ b/docs/html/classes.html
@@ -85,87 +85,88 @@
1.7.6.1
diff --git a/docs/html/classpyrax_1_1exceptions_1_1InternalServerError.html b/docs/html/classpyrax_1_1exceptions_1_1InternalServerError.html
new file mode 100644
index 00000000..47764b56
--- /dev/null
+++ b/docs/html/classpyrax_1_1exceptions_1_1InternalServerError.html
@@ -0,0 +1,142 @@
+
+
+
+
+
+|
+ pyrax
+
+
+ Python Bindings for the Rackspace Cloud
+ |
+
+
+
+
+
+
+ 1.7.6.1
+
+
+
+
diff --git a/docs/html/classpyrax_1_1exceptions_1_1InternalServerError.png b/docs/html/classpyrax_1_1exceptions_1_1InternalServerError.png
new file mode 100644
index 00000000..1fc7b154
Binary files /dev/null and b/docs/html/classpyrax_1_1exceptions_1_1InternalServerError.png differ
diff --git a/docs/html/classpyrax_1_1exceptions_1_1PyraxException.html b/docs/html/classpyrax_1_1exceptions_1_1PyraxException.html
index a72a132e..95cbabe1 100644
--- a/docs/html/classpyrax_1_1exceptions_1_1PyraxException.html
+++ b/docs/html/classpyrax_1_1exceptions_1_1PyraxException.html
@@ -135,84 +135,85 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
1.7.6.1
diff --git a/docs/html/classpyrax_1_1exceptions_1_1PyraxException.png b/docs/html/classpyrax_1_1exceptions_1_1PyraxException.png
index 5890cc91..b8792e3c 100644
Binary files a/docs/html/classpyrax_1_1exceptions_1_1PyraxException.png and b/docs/html/classpyrax_1_1exceptions_1_1PyraxException.png differ
diff --git a/docs/html/exceptions_8py.html b/docs/html/exceptions_8py.html
index 13668316..6c676435 100644
--- a/docs/html/exceptions_8py.html
+++ b/docs/html/exceptions_8py.html
@@ -115,6 +115,7 @@
1.7.6.1
diff --git a/docs/html/hierarchy.html b/docs/html/hierarchy.html
index da59da44..4555506f 100644
--- a/docs/html/hierarchy.html
+++ b/docs/html/hierarchy.html
@@ -360,6 +360,7 @@
1.7.6.1
diff --git a/docs/html/namespacepyrax_1_1exceptions.html b/docs/html/namespacepyrax_1_1exceptions.html
index d6a5951b..6a98e3d1 100644
--- a/docs/html/namespacepyrax_1_1exceptions.html
+++ b/docs/html/namespacepyrax_1_1exceptions.html
@@ -135,6 +135,7 @@
1.7.6.1
diff --git a/docs/html/namespacepyrax_1_1version.html b/docs/html/namespacepyrax_1_1version.html
index 9770bfe9..c8d5622d 100644
--- a/docs/html/namespacepyrax_1_1version.html
+++ b/docs/html/namespacepyrax_1_1version.html
@@ -105,7 +105,7 @@
Variables | |
| string | version = "1.7.1" |
| string | version = "1.7.2" |
1.7.6.1
diff --git a/docs/html/search/all_69.js b/docs/html/search/all_69.js
index 36cb3321..ca5a2178 100644
--- a/docs/html/search/all_69.js
+++ b/docs/html/search/all_69.js
@@ -26,6 +26,7 @@ var searchData=
['in_5fsetup',['in_setup',['../namespacepyrax.html#aee18dc40b08b618d107a4dc24a9e0459',1,'pyrax']]],
['install_5frequires',['install_requires',['../namespacesetup.html#af13461461c50ae271e468b6b20d1f831',1,'setup']]],
['instance',['instance',['../classpyrax_1_1clouddatabases_1_1CloudDatabaseVolume.html#a5ffaf17e178b3a6fa2012fe3050ede22',1,'pyrax::clouddatabases::CloudDatabaseVolume::instance()'],['../classpyrax_1_1fakes_1_1FakeDatabaseVolume.html#a5ffaf17e178b3a6fa2012fe3050ede22',1,'pyrax::fakes::FakeDatabaseVolume::instance()']]],
+ ['internalservererror',['InternalServerError',['../classpyrax_1_1exceptions_1_1InternalServerError.html',1,'pyrax::exceptions']]],
['interval',['interval',['../classpyrax_1_1utils_1_1__WaitThread.html#a943af1103d1f1365d6c7f31b331119bf',1,'pyrax::utils::_WaitThread']]],
['invalidcdnmetadata',['InvalidCDNMetadata',['../classpyrax_1_1exceptions_1_1InvalidCDNMetadata.html',1,'pyrax::exceptions']]],
['invalidconfigurationfile',['InvalidConfigurationFile',['../classpyrax_1_1exceptions_1_1InvalidConfigurationFile.html',1,'pyrax::exceptions']]],
diff --git a/docs/html/search/classes_69.js b/docs/html/search/classes_69.js
index 677fdb10..3feb44bb 100644
--- a/docs/html/search/classes_69.js
+++ b/docs/html/search/classes_69.js
@@ -10,6 +10,7 @@ var searchData=
['imagetagmanager',['ImageTagManager',['../classpyrax_1_1image_1_1ImageTagManager.html',1,'pyrax::image']]],
['imagetask',['ImageTask',['../classpyrax_1_1image_1_1ImageTask.html',1,'pyrax::image']]],
['imagetasksmanager',['ImageTasksManager',['../classpyrax_1_1image_1_1ImageTasksManager.html',1,'pyrax::image']]],
+ ['internalservererror',['InternalServerError',['../classpyrax_1_1exceptions_1_1InternalServerError.html',1,'pyrax::exceptions']]],
['invalidcdnmetadata',['InvalidCDNMetadata',['../classpyrax_1_1exceptions_1_1InvalidCDNMetadata.html',1,'pyrax::exceptions']]],
['invalidconfigurationfile',['InvalidConfigurationFile',['../classpyrax_1_1exceptions_1_1InvalidConfigurationFile.html',1,'pyrax::exceptions']]],
['invalidcredentialfile',['InvalidCredentialFile',['../classpyrax_1_1exceptions_1_1InvalidCredentialFile.html',1,'pyrax::exceptions']]],
diff --git a/docs/html/version_8py.html b/docs/html/version_8py.html
index 4bf74f36..3b8ff631 100644
--- a/docs/html/version_8py.html
+++ b/docs/html/version_8py.html
@@ -88,7 +88,7 @@
1.7.6.1
diff --git a/pyrax/base_identity.py b/pyrax/base_identity.py
index a635596f..64057b03 100644
--- a/pyrax/base_identity.py
+++ b/pyrax/base_identity.py
@@ -280,8 +280,12 @@ def authenticate(self):
# Invalid authorization
raise exc.AuthenticationFailed("Incorrect/unauthorized "
"credentials received")
- elif resp.status_code > 299:
- msg_dict = resp_body
+ elif 500 <= resp.status_code < 600:
+ # Internal Server Error
+ error_msg = resp.content or "Service Currently Unavailable"
+ raise exc.InternalServerError(error_msg)
+ elif 299 < resp.status_code < 500:
+ msg_dict = resp.json()
try:
msg = msg_dict[msg_dict.keys()[0]]["message"]
except KeyError:
diff --git a/pyrax/client.py b/pyrax/client.py
index 53e92b9a..e601a754 100644
--- a/pyrax/client.py
+++ b/pyrax/client.py
@@ -158,13 +158,6 @@ def request(self, uri, method, *args, **kwargs):
kwargs.setdefault("headers", kwargs.get("headers", {}))
kwargs["headers"]["User-Agent"] = self.user_agent
kwargs["headers"]["Accept"] = "application/json"
- if "body" in kwargs:
- if "Content-Type" not in kwargs["headers"]:
- kwargs["headers"]["Content-Type"] = "application/json"
- # JSON-encode by default, unless explicitly told not to.
- use_json = kwargs.pop("json_encode", True)
- if use_json:
- kwargs["body"] = json.dumps(kwargs["body"])
# Allow subclasses to add their own headers
self._add_custom_headers(kwargs["headers"])
resp, body = pyrax.http.request(method, uri, *args, **kwargs)
diff --git a/pyrax/exceptions.py b/pyrax/exceptions.py
index b8966589..f9547dd0 100644
--- a/pyrax/exceptions.py
+++ b/pyrax/exceptions.py
@@ -107,6 +107,9 @@ class KeyringUsernameMissing(PyraxException):
class IdentityClassNotDefined(PyraxException):
pass
+class InternalServerError(PyraxException):
+ pass
+
class InvalidCDNMetadata(PyraxException):
pass
diff --git a/pyrax/http.py b/pyrax/http.py
index 20f6c6ca..acdfe9f5 100644
--- a/pyrax/http.py
+++ b/pyrax/http.py
@@ -54,7 +54,8 @@ def request(method, uri, *args, **kwargs):
# The 'data' kwarg is used when you don't want json encoding.
data = kwargs.pop("data")
elif "body" in kwargs:
- kwargs["headers"]["Content-Type"] = "application/json"
+ if "Content-Type" not in kwargs["headers"]:
+ kwargs["headers"]["Content-Type"] = "application/json"
data = json.dumps(kwargs.pop("body"))
if data:
resp = req_method(uri, data=data, **kwargs)
diff --git a/pyrax/version.py b/pyrax/version.py
index 6ebe8792..079b3313 100644
--- a/pyrax/version.py
+++ b/pyrax/version.py
@@ -1,4 +1,4 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-version = "1.7.1"
+version = "1.7.2"
diff --git a/tests/unit/test_identity.py b/tests/unit/test_identity.py
index 31f0c8b8..422cc601 100644
--- a/tests/unit/test_identity.py
+++ b/tests/unit/test_identity.py
@@ -292,7 +292,7 @@ def test_authenticate_fail_other(self):
fake_resp.json = Mock(return_value={u'unauthorized': {
u'message': u'Username or api key is invalid', u'code': 500}})
pyrax.http.request = Mock(return_value=(fake_resp, fake_body))
- self.assertRaises(exc.AuthenticationFailed, ident.authenticate)
+ self.assertRaises(exc.InternalServerError, ident.authenticate)
pyrax.http.request = savrequest
def test_endpoint_defined(self):
+
+ 