diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-08-19 21:38:05 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-08-19 21:53:52 +1200 |
| commit | 45f4768a5cc4e820d1b5d7d221e2974f6ddf390d (patch) | |
| tree | 1af515b9525144b37f5223f73334391d72c479a5 /libmproxy/flow.py | |
| parent | a566684e3280ebbe15dd397710ee1b26bf8bd571 (diff) | |
| download | mitmproxy-45f4768a5cc4e820d1b5d7d221e2974f6ddf390d.tar.gz mitmproxy-45f4768a5cc4e820d1b5d7d221e2974f6ddf390d.tar.bz2 mitmproxy-45f4768a5cc4e820d1b5d7d221e2974f6ddf390d.zip | |
Add attribution and license for tnetstring.py
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 8ec1a6a3..c0130ec3 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -2,9 +2,9 @@ This module provides more sophisticated flow tracking. These match requests with their responses, and provide filtering and interception facilities. """ -import json, hashlib, Cookie, cookielib, base64, copy, re +import hashlib, Cookie, cookielib, copy, re import time -import netstring, filt, script, utils, encoding, proxy +import tnetstring, filt, script, utils, encoding, proxy from email.utils import parsedate_tz, formatdate, mktime_tz import controller, version @@ -1319,7 +1319,7 @@ class FlowWriter: def add(self, flow): d = flow._get_state() - netstring.dump(d, self.fo) + tnetstring.dump(d, self.fo) class FlowReadError(Exception): @@ -1339,7 +1339,7 @@ class FlowReader: off = 0 try: while 1: - data = netstring.load(self.fo) + data = tnetstring.load(self.fo) off = self.fo.tell() yield Flow._from_state(data) except ValueError, v: |