aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http/message.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-06-02 12:31:41 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-06-02 12:31:41 +1200
commitcccdc9842648518de7ee48ce461801954fc334c8 (patch)
tree288941673dc0db7ffe96be55ae2c34a1ce5db916 /netlib/http/message.py
parenteaa3b308f7bb48256ccf56ea07d008fa5f9dd6ad (diff)
downloadmitmproxy-cccdc9842648518de7ee48ce461801954fc334c8.tar.gz
mitmproxy-cccdc9842648518de7ee48ce461801954fc334c8.tar.bz2
mitmproxy-cccdc9842648518de7ee48ce461801954fc334c8.zip
Utils reorganisation: add netlib.strutils
Extract a number of string and format-related functions to netlib.strutils.
Diffstat (limited to 'netlib/http/message.py')
-rw-r--r--netlib/http/message.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/netlib/http/message.py b/netlib/http/message.py
index c51f16a2..b633b671 100644
--- a/netlib/http/message.py
+++ b/netlib/http/message.py
@@ -4,7 +4,7 @@ import warnings
import six
-from netlib import encoding, utils, basetypes
+from netlib import encoding, strutils, basetypes
from netlib.http import headers
if six.PY2: # pragma: no cover
@@ -19,7 +19,7 @@ else:
return x.decode("utf-8", "surrogateescape")
def _always_bytes(x):
- return utils.always_bytes(x, "utf-8", "surrogateescape")
+ return strutils.always_bytes(x, "utf-8", "surrogateescape")
class MessageData(basetypes.Serializable):
@@ -200,7 +200,7 @@ class Message(basetypes.Serializable):
replacements = 0
if self.content:
with decoded(self):
- self.content, replacements = utils.safe_subn(
+ self.content, replacements = strutils.safe_subn(
pattern, repl, self.content, flags=flags
)
replacements += self.headers.replace(pattern, repl, flags)