From: Kenneth Reitz <me@kennethreitz.com>
Date: Tue, 1 May 2012 11:06:55 +0000 (-0400)
Subject: syntax errors
X-Git-Tag: v0.12.0~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6cce7a5bd51aa0ff916987b9c070753f702ccde;p=services%2Fpython-requests.git

syntax errors
---

diff --git a/requests/auth.py b/requests/auth.py
index 64f698e..5d2d982 100644
--- a/requests/auth.py
+++ b/requests/auth.py
@@ -15,15 +15,15 @@ from base64 import b64encode
 from .compat import urlparse, str, is_py2
 from .utils import randombytes, parse_dict_header
 
-CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'
-
-if is_py2:
+try:
     from oauthlib.oauth1.rfc5849 import (Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER)
     from oauthlib.common import extract_params
-else:
+except (ImportError, SyntaxError):
     SIGNATURE_HMAC = None
     SIGNATURE_TYPE_AUTH_HEADER = None
 
+CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'
+
 def _basic_auth_str(username, password):
     """Returns a Basic Auth string."""