From: Kenneth Reitz Date: Tue, 1 May 2012 10:54:09 +0000 (-0400) Subject: only import oauthlib in python2 X-Git-Tag: v0.12.0~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=661af1dc1ab08403c2d71310d7e7c00f684a1861;p=services%2Fpython-requests.git only import oauthlib in python2 --- diff --git a/requests/auth.py b/requests/auth.py index 58e3206..2febe49 100644 --- a/requests/auth.py +++ b/requests/auth.py @@ -11,14 +11,16 @@ import time import hashlib from base64 import b64encode -from oauthlib.oauth1.rfc5849 import (Client, - SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER) + from oauthlib.common import extract_params -from .compat import urlparse, str +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: + from oauthlib.oauth1.rfc5849 import (Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER) + def _basic_auth_str(username, password): """Returns a Basic Auth string."""