aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-20 11:06:57 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-20 11:06:57 +1300
commit301d52d9d05f2c5f074fe68c73acc1c32e518020 (patch)
treef55ac41b1deb5ea0a3baa63930c0ef5193f3886f
parentf964d49853a3f0d22e0f6d4cff7cfbc49008e40e (diff)
downloadmitmproxy-301d52d9d05f2c5f074fe68c73acc1c32e518020.tar.gz
mitmproxy-301d52d9d05f2c5f074fe68c73acc1c32e518020.tar.bz2
mitmproxy-301d52d9d05f2c5f074fe68c73acc1c32e518020.zip
netlib.encoding -> netlib.http.encoding
Encoding is highly specific to http, and only used within this module.
-rw-r--r--netlib/http/encoding.py (renamed from netlib/encoding.py)0
-rw-r--r--netlib/http/message.py2
-rw-r--r--test/netlib/http/test_encoding.py (renamed from test/netlib/test_encoding.py)3
3 files changed, 3 insertions, 2 deletions
diff --git a/netlib/encoding.py b/netlib/http/encoding.py
index e123a033..e123a033 100644
--- a/netlib/encoding.py
+++ b/netlib/http/encoding.py
diff --git a/netlib/http/message.py b/netlib/http/message.py
index 62c3aa38..772a124e 100644
--- a/netlib/http/message.py
+++ b/netlib/http/message.py
@@ -3,7 +3,7 @@ import warnings
from typing import Optional
from mitmproxy.utils import strutils
-from netlib import encoding
+from netlib.http import encoding
from mitmproxy.types import serializable
from netlib.http import headers
diff --git a/test/netlib/test_encoding.py b/test/netlib/http/test_encoding.py
index e1175ef0..681f9bfc 100644
--- a/test/netlib/test_encoding.py
+++ b/test/netlib/http/test_encoding.py
@@ -1,7 +1,8 @@
import mock
import pytest
-from netlib import encoding, tutils
+from netlib.http import encoding
+from netlib import tutils
@pytest.mark.parametrize("encoder", [