diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-04-21 11:19:00 +1200 | 
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-04-21 11:19:00 +1200 | 
| commit | 7d83e388aa78bb3637f71a4afb60af1baecb0314 (patch) | |
| tree | 42d3a89997fbd38db887a2143d412e18ed8b54a7 /netlib | |
| parent | dd7ea896f24514bb2534b3762255e99f0aabc055 (diff) | |
| download | mitmproxy-7d83e388aa78bb3637f71a4afb60af1baecb0314.tar.gz mitmproxy-7d83e388aa78bb3637f71a4afb60af1baecb0314.tar.bz2 mitmproxy-7d83e388aa78bb3637f71a4afb60af1baecb0314.zip | |
Whitespace, pep8, mixed indentation
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/http.py | 19 | ||||
| -rw-r--r-- | netlib/utils.py | 4 | 
2 files changed, 18 insertions, 5 deletions
| diff --git a/netlib/http.py b/netlib/http.py index 5501ce73..b925fe87 100644 --- a/netlib/http.py +++ b/netlib/http.py @@ -331,12 +331,15 @@ def read_response(rfile, request_method, body_size_limit, include_body=True):          Return an (httpversion, code, msg, headers, content) tuple.          By default, both response header and body are read. -        If include_body=False is specified, content may be one of the following: +        If include_body=False is specified, content may be one of the +        following:          - None, if the response is technically allowed to have a response body -        - "", if the response must not have a response body (e.g. it's a response to a HEAD request) +        - "", if the response must not have a response body (e.g. it's a +        response to a HEAD request)      """      line = rfile.readline() -    if line == "\r\n" or line == "\n":  # Possible leftover from previous message +    # Possible leftover from previous message +    if line == "\r\n" or line == "\n":          line = rfile.readline()      if not line:          raise HttpErrorConnClosed(502, "Server disconnect.") @@ -373,7 +376,15 @@ def read_http_body(*args, **kwargs):      ) -def read_http_body_chunked(rfile, headers, limit, request_method, response_code, is_request, max_chunk_size=None): +def read_http_body_chunked( +    rfile, +    headers, +    limit, +    request_method, +    response_code, +    is_request, +    max_chunk_size=None +):      """          Read an HTTP message body: diff --git a/netlib/utils.py b/netlib/utils.py index 57532453..66bbdb5e 100644 --- a/netlib/utils.py +++ b/netlib/utils.py @@ -8,9 +8,11 @@ def isascii(s):          return False      return True +  # best way to do it in python 2.x  def bytes_to_int(i): -  return int(i.encode('hex'), 16) +    return int(i.encode('hex'), 16) +  def cleanBin(s, fixspacing=False):      """ | 
