From 1cdd3632a0eeffd1efc71c6d650b5e340536cb63 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Mon, 7 Jun 2004 03:49:50 +0000 Subject: Cleanup: the in operator already returns a bool, no need to bool() it again Cleanup: use condition to be consistent with code above CookieJar is in cookielib --- Lib/urllib2.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/urllib2.py b/Lib/urllib2.py index 448e948..301b5de 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -263,8 +263,8 @@ class Request: self.unredirected_hdrs[key.capitalize()] = val def has_header(self, header_name): - return bool(header_name in self.headers or - header_name in self.unredirected_hdrs) + return (header_name in self.headers or + header_name in self.unredirected_hdrs) def get_header(self, header_name, default=None): return self.headers.get( @@ -295,7 +295,7 @@ class OpenerDirector: condition = meth[i+1:] if condition.startswith("error"): - j = meth[i+1:].find("_") + i + 1 + j = condition.find("_") + i + 1 kind = meth[j+1:] try: kind = int(kind) @@ -1026,7 +1026,7 @@ if hasattr(httplib, 'HTTPS'): class HTTPCookieProcessor(BaseHandler): def __init__(self, cookiejar=None): if cookiejar is None: - cookiejar = CookieJar() + cookiejar = cookielib.CookieJar() self.cookiejar = cookiejar def http_request(self, request): -- cgit v0.12