diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-11-11 12:29:34 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-11-11 12:29:34 +0100 |
| commit | 8635e00175117d8574b4bea5edc1c43528ddf3e9 (patch) | |
| tree | 1be23a6349a8fb81a89f8417b0b9d236d1829639 /libpathod/test.py | |
| parent | b917b61e6aead4f353ef15838315ecc0df721e29 (diff) | |
| parent | 27c7e9e9345bbc458e7efc4093c2074e19011d12 (diff) | |
| download | mitmproxy-8635e00175117d8574b4bea5edc1c43528ddf3e9.tar.gz mitmproxy-8635e00175117d8574b4bea5edc1c43528ddf3e9.tar.bz2 mitmproxy-8635e00175117d8574b4bea5edc1c43528ddf3e9.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
setup.py
Diffstat (limited to 'libpathod/test.py')
| -rw-r--r-- | libpathod/test.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/libpathod/test.py b/libpathod/test.py index 57d40300..6f95a797 100644 --- a/libpathod/test.py +++ b/libpathod/test.py @@ -1,4 +1,5 @@ -import threading, Queue +import threading +import Queue import requests import requests.packages.urllib3 import pathod @@ -6,7 +7,6 @@ import pathod requests.packages.urllib3.disable_warnings() - class Daemon: IFACE = "127.0.0.1" def __init__(self, ssl=None, **daemonargs): @@ -14,7 +14,11 @@ class Daemon: self.thread = _PaThread(self.IFACE, self.q, ssl, daemonargs) self.thread.start() self.port = self.q.get(True, 5) - self.urlbase = "%s://%s:%s"%("https" if ssl else "http", self.IFACE, self.port) + self.urlbase = "%s://%s:%s"%( + "https" if ssl else "http", + self.IFACE, + self.port + ) def __enter__(self): return self @@ -80,6 +84,9 @@ class _PaThread(threading.Thread): ssl = self.ssl, **self.daemonargs ) - self.name = "PathodThread (%s:%s)" % (self.server.address.host, self.server.address.port) + self.name = "PathodThread (%s:%s)" % ( + self.server.address.host, + self.server.address.port + ) self.q.put(self.server.address.port) self.server.serve_forever() |