From 17170a2ca7672c6b05282c45f91430a32d8521fc Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 13 Mar 2012 12:59:33 -0700 Subject: [PATCH 1/2] Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop From eae641485bf46081f0f36726716f27034e814d50 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 13 Mar 2012 17:04:26 -0700 Subject: [PATCH 2/2] Remove unused import --- requests/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/auth.py b/requests/auth.py index 2e2bebcb..385dd27d 100644 --- a/requests/auth.py +++ b/requests/auth.py @@ -11,7 +11,7 @@ import time import hashlib from base64 import b64encode -from .compat import urlparse, str, bytes +from .compat import urlparse, str from .utils import randombytes, parse_dict_header