diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-20 12:36:26 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-20 12:36:26 +1300 |
| commit | 711078ba3f63257df745bb3edd80a85717e94b20 (patch) | |
| tree | d3116cd540faf01f272a0892fc6a9b83b4f6de8a /pathod/utils.py | |
| parent | ee56d3fae0baeef1f31a83db122dd832d4c0e07e (diff) | |
| parent | 8430f857b504a3e7406dc36e54dc32783569d0dd (diff) | |
| download | mitmproxy-711078ba3f63257df745bb3edd80a85717e94b20.tar.gz mitmproxy-711078ba3f63257df745bb3edd80a85717e94b20.tar.bz2 mitmproxy-711078ba3f63257df745bb3edd80a85717e94b20.zip | |
Merge pull request #1637 from cortesi/tatanetlib
This PR merges netlib into mitmproxy
Diffstat (limited to 'pathod/utils.py')
| -rw-r--r-- | pathod/utils.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pathod/utils.py b/pathod/utils.py index 2d077c48..44ad1f87 100644 --- a/pathod/utils.py +++ b/pathod/utils.py @@ -1,6 +1,6 @@ import os import sys -import netlib.utils +from mitmproxy.utils import data as mdata class MemBool: @@ -17,7 +17,8 @@ class MemBool: return bool(v) -data = netlib.utils.Data(__name__) +# FIXME: change this name +data = mdata.Data(__name__) def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'): # pragma: no cover |