From 6fed1921edf1baaf23a54fbe340ff3781fc05c86 Mon Sep 17 00:00:00 2001 From: stamparm Date: Tue, 16 Apr 2013 14:17:41 +0200 Subject: [PATCH] Bug fix (there are cases when provided kwargs containing explicit None values while we want to use the alternative in those kind of cases; there was an intention in original code, while the implementation was buggy) --- lib/request/connect.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/request/connect.py b/lib/request/connect.py index 930928653..1447af81e 100644 --- a/lib/request/connect.py +++ b/lib/request/connect.py @@ -192,22 +192,22 @@ class Connect(object): kb.requestCounter += 1 threadData.lastRequestUID = kb.requestCounter - url = kwargs.get("url", conf.url) + url = kwargs.get("url", None) or conf.url get = kwargs.get("get", None) post = kwargs.get("post", None) method = kwargs.get("method", None) cookie = kwargs.get("cookie", None) - ua = kwargs.get("ua", None) - referer = kwargs.get("referer", None) - host = kwargs.get("host", conf.host) + ua = kwargs.get("ua", None) or conf.agent + referer = kwargs.get("referer", None) or conf.referer + host = kwargs.get("host", None) or conf.host direct_ = kwargs.get("direct", False) multipart = kwargs.get("multipart", False) silent = kwargs.get("silent", False) raise404 = kwargs.get("raise404", True) - timeout = kwargs.get("timeout", conf.timeout) + timeout = kwargs.get("timeout", None) or conf.timeout auxHeaders = kwargs.get("auxHeaders", None) response = kwargs.get("response", False) - ignoreTimeout = kwargs.get("ignoreTimeout", kb.ignoreTimeout) + ignoreTimeout = kwargs.get("ignoreTimeout", False) or kb.ignoreTimeout refreshing = kwargs.get("refreshing", False) retrying = kwargs.get("retrying", False) crawling = kwargs.get("crawling", False)