Import oauthlib without the obsolete wrapper.

Fixes #1000.

diff --git a/requests/auth.py b/requests/auth.py
index f86c0ccd7b73b9f29cb0e99ec5d657230501090c..9724c7ff5fa9fe792f72f654c5ea41ebf2b84ed3 100644 (file)
--- a/requests/auth.py
+++ b/requests/auth.py
@@ -19,7 +19,8 @@ from .compat import urlparse, str
 from .utils import parse_dict_header
 
 try:
-    from ._oauth import (Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER, extract_params)
+    from oauthlib.common import extract_params
+    from oauthlib.oauth1.rfc5849 import (Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER)
 
 except (ImportError, SyntaxError):
     SIGNATURE_HMAC = None