diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-05-31 17:33:57 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-05-31 17:33:57 -0700 |
commit | 1dd078beb23aa0b483f945eed39c0136984f81a6 (patch) | |
tree | c21863e80e79f934c1744ad1e5851d2ef95c9087 /netlib/http/headers.py | |
parent | ebeda5e8d261bcdd8763ce4e634d534b0285527c (diff) | |
parent | 44fdcb4b8291a5be6738f32d6fde307af3f2034e (diff) | |
download | mitmproxy-1dd078beb23aa0b483f945eed39c0136984f81a6.tar.gz mitmproxy-1dd078beb23aa0b483f945eed39c0136984f81a6.tar.bz2 mitmproxy-1dd078beb23aa0b483f945eed39c0136984f81a6.zip |
Merge pull request #1182 from cortesi/netlibimports
Reorganise netlib imports according to Google Style Guide
Diffstat (limited to 'netlib/http/headers.py')
-rw-r--r-- | netlib/http/headers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/netlib/http/headers.py b/netlib/http/headers.py index fa7b7180..9bf4b69d 100644 --- a/netlib/http/headers.py +++ b/netlib/http/headers.py @@ -3,8 +3,8 @@ from __future__ import absolute_import, print_function, division import re import six -from ..multidict import MultiDict -from ..utils import always_bytes +from netlib import multidict +from netlib import utils # See also: http://lucumr.pocoo.org/2013/7/2/the-updated-guide-to-unicode/ @@ -20,10 +20,10 @@ else: return x.decode("utf-8", "surrogateescape") def _always_bytes(x): - return always_bytes(x, "utf-8", "surrogateescape") + return utils.always_bytes(x, "utf-8", "surrogateescape") -class Headers(MultiDict): +class Headers(multidict.MultiDict): """ Header class which allows both convenient access to individual headers as well as direct access to the underlying raw data. Provides a full dictionary interface. |