From 16e5119b2ad8be05673b5f8762cd71edaa0cd882 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Mon, 14 Feb 2011 12:39:13 -0500 Subject: [PATCH] fixed gevent problem --- requests/core.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/requests/core.py b/requests/core.py index d04ef72..5f61416 100644 --- a/requests/core.py +++ b/requests/core.py @@ -103,23 +103,27 @@ class Request(object): _handlers = [] - if self.auth: - - authr = urllib2.HTTPPasswordMgrWithDefaultRealm() + if self.auth or self.cookiejar: - authr.add_password(None, self.url, self.auth.username, self.auth.password) - auth_handler = urllib2.HTTPBasicAuthHandler(authr) + if self.auth: - _handlers.append(auth_handler) + authr = urllib2.HTTPPasswordMgrWithDefaultRealm() - if self.cookiejar: - - cookie_handler = urllib2.HTTPCookieProcessor(cookiejar) - _handlers.append(cookie_handler) + authr.add_password(None, self.url, self.auth.username, self.auth.password) + auth_handler = urllib2.HTTPBasicAuthHandler(authr) - - opener = urllib2.build_opener(*_handlers) - return opener.open + _handlers.append(auth_handler) + + if self.cookiejar: + + cookie_handler = urllib2.HTTPCookieProcessor(cookiejar) + _handlers.append(cookie_handler) + + opener = urllib2.build_opener(*_handlers) + return opener.open + + else: + return urllib2.urlopen def _build_response(self, resp): -- 2.7.4