From ff1e7e64094185205a09eda71ef3c83a9fbcc75c Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sat, 1 Aug 2015 14:53:34 +0200 Subject: fix imports for encoding --- libmproxy/protocol/http.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmproxy/protocol') diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index a85a4f30..1b58f824 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -8,14 +8,14 @@ import urlparse from email.utils import parsedate_tz, formatdate, mktime_tz import netlib -from netlib import http, tcp, odict, utils +from netlib import http, tcp, odict, utils, encoding from netlib.http import cookies, http1, http2 from netlib.http.semantics import CONTENT_MISSING from .tcp import TCPHandler from .primitives import KILL, ProtocolHandler, Flow, Error from ..proxy.connection import ServerConnection -from .. import encoding, utils, controller, stateobject, proxy +from .. import utils, controller, stateobject, proxy from .http_wrappers import decoded, HTTPRequest, HTTPResponse -- cgit v1.2.3