From e1c22fad3fffb485da400e4b34c094f201a2c72e Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Apr 2015 18:03:46 +0200 Subject: range -> xrange --- pyload/network/HTTPRequest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyload/network/HTTPRequest.py') diff --git a/pyload/network/HTTPRequest.py b/pyload/network/HTTPRequest.py index 62c0ef72b..d87a3ee7e 100644 --- a/pyload/network/HTTPRequest.py +++ b/pyload/network/HTTPRequest.py @@ -24,7 +24,7 @@ def myurlencode(data): data = dict(data) return urlencode(dict((encode(x), encode(y)) for x, y in data.iteritems())) -bad_headers = range(400, 404) + range(405, 418) + range(500, 506) +bad_headers = xrange(400, 404) + xrange(405, 418) + xrange(500, 506) class BadHeader(Exception): -- cgit v1.2.3 From df6943c37f10d98a62ca95881116b8b4debda670 Mon Sep 17 00:00:00 2001 From: fedeG Date: Mon, 20 Apr 2015 18:06:51 +0200 Subject: PEP-8, Python Zen, refactor and reduce code (part 9 in master module/network) Conflicts: module/network/Bucket.py module/network/CookieJar.py pyload/network/Browser.py pyload/network/HTTPChunk.py pyload/network/HTTPDownload.py pyload/network/HTTPRequest.py pyload/network/RequestFactory.py pyload/network/XDCCRequest.py --- pyload/network/HTTPRequest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pyload/network/HTTPRequest.py') diff --git a/pyload/network/HTTPRequest.py b/pyload/network/HTTPRequest.py index d87a3ee7e..1c645f898 100644 --- a/pyload/network/HTTPRequest.py +++ b/pyload/network/HTTPRequest.py @@ -76,7 +76,7 @@ class HTTPRequest(object): if hasattr(pycurl, "USE_SSL"): self.c.setopt(pycurl.USE_SSL, pycurl.CURLUSESSL_TRY) - #self.c.setopt(pycurl.VERBOSE, 1) + # self.c.setopt(pycurl.VERBOSE, 1) self.c.setopt(pycurl.USERAGENT, "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:37.0) Gecko/20100101 Firefox/37.0") @@ -254,8 +254,8 @@ class HTTPRequest(object): for line in header: line = line.lower().replace(" ", "") - if not line.startswith("content-type:") or\ - ("text" not in line and "application" not in line): + if not line.startswith("content-type:") or \ + ("text" not in line and "application" not in line): continue none, delemiter, charset = line.rpartition("charset=") @@ -265,7 +265,7 @@ class HTTPRequest(object): encoding = charset[0] try: - #self.log.debug("Decoded %s" % encoding ) + # self.log.debug("Decoded %s" % encoding ) if lookup(encoding).name == 'utf-8' and rep.startswith(BOM_UTF8): encoding = 'utf-8-sig' -- cgit v1.2.3 From 892b7cbd4981b764bed30b2ccc5ca73d791c39f2 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 20 Apr 2015 22:56:34 +0200 Subject: Spare code cosmetics (9) --- pyload/network/HTTPRequest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pyload/network/HTTPRequest.py') diff --git a/pyload/network/HTTPRequest.py b/pyload/network/HTTPRequest.py index 1c645f898..92ce6ec4b 100644 --- a/pyload/network/HTTPRequest.py +++ b/pyload/network/HTTPRequest.py @@ -41,16 +41,16 @@ class HTTPRequest(object): self.c = pycurl.Curl() self.rep = StringIO() - self.cj = cookies # cookiejar + self.cj = cookies #: cookiejar self.lastURL = None self.lastEffectiveURL = None self.abort = False - self.code = 0 # last http code + self.code = 0 #: last http code self.header = "" - self.headers = [] # temporary request header + self.headers = [] #: temporary request header self.initHandle() self.setInterface(options) @@ -158,7 +158,7 @@ class HTTPRequest(object): self.c.setopt(pycurl.POST, 1) if not multipart: if type(post) == unicode: - post = str(post) # unicode not allowed + post = str(post) #: unicode not allowed elif type(post) == str: pass else: @@ -250,7 +250,7 @@ class HTTPRequest(object): def decodeResponse(self, rep): """ decode with correct encoding, relies on header """ header = self.header.splitlines() - encoding = "utf8" # default encoding + encoding = "utf8" #: default encoding for line in header: line = line.lower().replace(" ", "") -- cgit v1.2.3