diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-28 17:44:55 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-28 17:44:55 +0100 |
| commit | 1b566869de4d07d509fa2ead6b91486326a9e5a4 (patch) | |
| tree | 8e776fec3323ab0db96a895ebc684606457209d6 /libpathod/test.py | |
| parent | f83508d4bf313710de8afa204aaf9be227cf812c (diff) | |
| parent | ea894282f3a659cbb9466ce235c21f53f002ac3a (diff) | |
| download | mitmproxy-1b566869de4d07d509fa2ead6b91486326a9e5a4.tar.gz mitmproxy-1b566869de4d07d509fa2ead6b91486326a9e5a4.tar.bz2 mitmproxy-1b566869de4d07d509fa2ead6b91486326a9e5a4.zip | |
Merge branch 'master' into tcp_proxy
Diffstat (limited to 'libpathod/test.py')
| -rw-r--r-- | libpathod/test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpathod/test.py b/libpathod/test.py index 2456e211..cc858497 100644 --- a/libpathod/test.py +++ b/libpathod/test.py @@ -1,6 +1,6 @@ -import json, threading, Queue +import threading, Queue import requests -import pathod, utils +import pathod class Daemon: |