Use ValueError instad of JSONDecodeError to support django.utils.simplejson utility...

diff --git a/social_auth/backends/__init__.py b/social_auth/backends/__init__.py
index 53256605f2b62a4ac8a39b84de52aafc8bbc428a..a41588741405ccf63d785890d8690f7b7f1530be 100644 (file)
--- a/social_auth/backends/__init__.py
+++ b/social_auth/backends/__init__.py
@@ -660,7 +660,7 @@ class BaseOAuth2(BaseOAuth):
 
         try:
             response = simplejson.loads(urlopen(request).read())
-        except (simplejson.JSONDecodeError, KeyError):
+        except (ValueError, KeyError):
             raise ValueError('Unknown OAuth2 response type')
 
         if response.get('error'):

diff --git a/social_auth/backends/contrib/orkut.py b/social_auth/backends/contrib/orkut.py
index 4ffbf60889ef318a99753cef0420553e7ca08f8a..ebd3021bc8c15174d8f188db0f5393c33e2289b0 100644 (file)
--- a/social_auth/backends/contrib/orkut.py
+++ b/social_auth/backends/contrib/orkut.py
@@ -62,7 +62,7 @@ class OrkutAuth(BaseGoogleOAuth):
         response = urllib.urlopen(request.to_url()).read()
         try:
             return simplejson.loads(response)['data']
-        except (simplejson.JSONDecodeError, KeyError):
+        except (ValueError, KeyError):
             return None
 
 

diff --git a/social_auth/backends/facebook.py b/social_auth/backends/facebook.py
index 2c1414508d0b79f1ee92d0803f98c9b6ac58e719..26f541e461ee391ce03a2f17fe32ef67a3ed5333 100644 (file)
--- a/social_auth/backends/facebook.py
+++ b/social_auth/backends/facebook.py
@@ -88,7 +88,7 @@ class FacebookAuth(BaseOAuth):
         url = FACEBOOK_CHECK_AUTH + '?' + urllib.urlencode(params)
         try:
             return simplejson.load(urllib.urlopen(url))
-        except simplejson.JSONDecodeError:
+        except ValueError:
             return None
 
     @classmethod

diff --git a/social_auth/backends/google.py b/social_auth/backends/google.py
index 9210f5483b0b6f38ef14e001d9c1d20e29cf8d51..efc4a3d1c31a4711f2c28b4e7b44898a249bfb1c 100644 (file)
--- a/social_auth/backends/google.py
+++ b/social_auth/backends/google.py
@@ -167,7 +167,7 @@ def googleapis_email(url, params):
     request = Request(url + '?' + params, headers={'Authorization': params})
     try:
         return simplejson.loads(urlopen(request).read())['data']
-    except (simplejson.JSONDecodeError, KeyError, IOError):
+    except (ValueError, KeyError, IOError):
         return None
 
 

diff --git a/social_auth/backends/twitter.py b/social_auth/backends/twitter.py
index aaed2c952530bb540d961fa6bb96db51ff15ff97..8f87cf84e4157189f99da238b6eb77897ef3da0e 100644 (file)
--- a/social_auth/backends/twitter.py
+++ b/social_auth/backends/twitter.py
@@ -56,7 +56,7 @@ class TwitterAuth(ConsumerBasedOAuth):
         json = self.fetch_response(request)
         try:
             return simplejson.loads(json)
-        except simplejson.JSONDecodeError:
+        except ValueError:
             return None