diff options
Diffstat (limited to 'libpathod')
| -rw-r--r-- | libpathod/main.py | 10 | ||||
| -rw-r--r-- | libpathod/pathoc.py | 5 | ||||
| -rw-r--r-- | libpathod/pathod.py | 10 | ||||
| -rw-r--r-- | libpathod/test.py | 15 |
4 files changed, 30 insertions, 10 deletions
diff --git a/libpathod/main.py b/libpathod/main.py index 6f53832d..ff407ff6 100644 --- a/libpathod/main.py +++ b/libpathod/main.py @@ -17,8 +17,14 @@ def pathoc(): print " ", i[1], i[0] sys.exit(0) - parser = argparse.ArgumentParser(description='A perverse HTTP client.', parents=[preparser]) - parser.add_argument('--version', action='version', version="pathoc " + version.VERSION) + parser = argparse.ArgumentParser( + description='A perverse HTTP client.', parents=[preparser] + ) + parser.add_argument( + '--version', + action='version', + version="pathoc " + version.VERSION + ) parser.add_argument( "-c", dest="connect_to", type=str, default=False, metavar = "HOST:PORT", diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index 938dbeba..ba831fc6 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -1,4 +1,5 @@ -import sys, os +import sys +import os from netlib import tcp, http, certutils import netlib.utils import language, utils @@ -173,7 +174,7 @@ class Pathoc(tcp.TCPClient): print >> fp, "%s=%s"%cn, print >> fp print >> fp, "\tVersion: %s"%i.get_version() - print >> fp, "\tValidity: %s - %s"%(i.get_notBefore(),i.get_notAfter()) + print >> fp, "\tValidity: %s - %s"%(i.get_notBefore(),i.get_notAfter()) print >> fp, "\tSerial: %s"%i.get_serial_number() print >> fp, "\tAlgorithm: %s"%i.get_signature_algorithm() pk = i.get_pubkey() diff --git a/libpathod/pathod.py b/libpathod/pathod.py index 79fe7ed1..ecf1cc7e 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -1,6 +1,11 @@ -import urllib, threading, re, logging, os +import urllib +import threading +import re +import logging +import os from netlib import tcp, http, wsgi, certutils import netlib.utils + import version, app, language, utils @@ -12,7 +17,8 @@ CA_CERT_NAME = "mitmproxy-ca.pem" logger = logging.getLogger('pathod') -class PathodError(Exception): pass +class PathodError(Exception): + pass class SSLOptions: 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() |