summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIb Lundgren <ib.lundgren@gmail.com>2013-10-14 14:22:45 -0700
committerIb Lundgren <ib.lundgren@gmail.com>2013-10-14 14:22:45 -0700
commit99d753d8be8ef831147c5f3ffa5651ace507f356 (patch)
treea6c1c168fd86647d396630a372b97d2bcdfe5123
parentf66c1e33eedc71e2ff75ea924cd4cbdbf10d4086 (diff)
parent274b899af69082656c8ba5f755d25f264b88eb01 (diff)
downloadoauthlib-99d753d8be8ef831147c5f3ffa5651ace507f356.tar.gz
Merge pull request #217 from lepture/fix-json
JSON content type has no charset.
-rw-r--r--docs/oauth2/endpoints/token.rst2
-rw-r--r--oauthlib/oauth2/rfc6749/grant_types/authorization_code.py2
-rw-r--r--oauthlib/oauth2/rfc6749/grant_types/client_credentials.py2
-rw-r--r--oauthlib/oauth2/rfc6749/grant_types/refresh_token.py2
-rw-r--r--oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py2
-rw-r--r--oauthlib/oauth2/rfc6749/parameters.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/docs/oauth2/endpoints/token.rst b/docs/oauth2/endpoints/token.rst
index bf1a256..9bf9f8d 100644
--- a/docs/oauth2/endpoints/token.rst
+++ b/docs/oauth2/endpoints/token.rst
@@ -53,7 +53,7 @@ tokens which unless you are certain you need them, are a bad idea.
# headers will contain some suggested headers to add to your response
{
- 'Content-Type': 'application/json;charset=UTF-8',
+ 'Content-Type': 'application/json',
'Cache-Control': 'no-store',
'Pragma': 'no-cache',
}
diff --git a/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py b/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
index 1adab52..7132105 100644
--- a/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
+++ b/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
@@ -220,7 +220,7 @@ class AuthorizationCodeGrant(GrantTypeBase):
code is bound to the client identifier and redirection URI.
"""
headers = {
- 'Content-Type': 'application/json;charset=UTF-8',
+ 'Content-Type': 'application/json',
'Cache-Control': 'no-store',
'Pragma': 'no-cache',
}
diff --git a/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py b/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
index e69e29d..c00d067 100644
--- a/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
+++ b/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
@@ -62,7 +62,7 @@ class ClientCredentialsGrant(GrantTypeBase):
.. _`Section 5.2`: http://tools.ietf.org/html/rfc6749#section-5.2
"""
headers = {
- 'Content-Type': 'application/json;charset=UTF-8',
+ 'Content-Type': 'application/json',
'Cache-Control': 'no-store',
'Pragma': 'no-cache',
}
diff --git a/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py b/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
index 131785f..0f6d235 100644
--- a/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
+++ b/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
@@ -46,7 +46,7 @@ class RefreshTokenGrant(GrantTypeBase):
.. _`Section 5.2`: http://tools.ietf.org/html/rfc6749#section-5.2
"""
headers = {
- 'Content-Type': 'application/json;charset=UTF-8',
+ 'Content-Type': 'application/json',
'Cache-Control': 'no-store',
'Pragma': 'no-cache',
}
diff --git a/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py b/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
index 7fce5dd..c8d1e60 100644
--- a/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
+++ b/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
@@ -82,7 +82,7 @@ class ResourceOwnerPasswordCredentialsGrant(GrantTypeBase):
.. _`Section 5.2`: http://tools.ietf.org/html/rfc6749#section-5.2
"""
headers = {
- 'Content-Type': 'application/json;charset=UTF-8',
+ 'Content-Type': 'application/json',
'Cache-Control': 'no-store',
'Pragma': 'no-cache',
}
diff --git a/oauthlib/oauth2/rfc6749/parameters.py b/oauthlib/oauth2/rfc6749/parameters.py
index d265b41..a6efce7 100644
--- a/oauthlib/oauth2/rfc6749/parameters.py
+++ b/oauthlib/oauth2/rfc6749/parameters.py
@@ -276,7 +276,7 @@ def parse_token_response(body, scope=None):
.. code-block:: http
HTTP/1.1 200 OK
- Content-Type: application/json;charset=UTF-8
+ Content-Type: application/json
Cache-Control: no-store
Pragma: no-cache