diff options
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | libpathod/pathoc.py | 5 | ||||
| -rw-r--r-- | libpathod/pathod.py | 12 | ||||
| -rw-r--r-- | libpathod/test.py | 4 | ||||
| -rw-r--r-- | libpathod/utils.py | 2 | ||||
| -rw-r--r-- | libpathod/version.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 3 | ||||
| -rw-r--r-- | test/requirements.txt | 4 |
8 files changed, 27 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index 920563f5..2cc19030 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,18 @@ python: - "2.7" # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - - "pip install coveralls --use-mirrors" - - "pip install nose-cov --use-mirrors" - - "pip install -r requirements.txt --use-mirrors" - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git" + - "pip install -r requirements.txt --use-mirrors" + - "pip install -r test/requirements.txt --use-mirrors" # command to run tests, e.g. python setup.py test script: - "nosetests --with-cov --cov-report term-missing" after_success: - - coveralls
\ No newline at end of file + - coveralls +notifications: + irc: + channels: + - "irc.oftc.net#mitmproxy" + on_success: change + on_failure: always + diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index c926f15f..0769b43c 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -1,5 +1,4 @@ import sys, os -import json from netlib import tcp, http import netlib.utils import language, utils @@ -45,7 +44,7 @@ class Pathoc(tcp.TCPClient): parsed = http.parse_response_line(l) if not parsed[1] == 200: raise PathocError("Proxy CONNECT failed: %s - %s"%(parsed[1], parsed[2])) - headers = http.read_headers(self.rfile) + http.read_headers(self.rfile) def connect(self, connect_to=None): """ @@ -69,7 +68,7 @@ class Pathoc(tcp.TCPClient): language.FileAccessDenied. """ r = language.parse_request(self.settings, spec) - ret = language.serve(r, self.wfile, self.settings, self.host) + language.serve(r, self.wfile, self.settings, self.host) self.wfile.flush() return Response(*http.read_response(self.rfile, r.method, None)) diff --git a/libpathod/pathod.py b/libpathod/pathod.py index 39de1b7b..5433805f 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -1,5 +1,5 @@ -import urllib, threading, re, logging, socket, sys, base64 -from netlib import tcp, http, odict, wsgi, certutils +import urllib, threading, re, logging +from netlib import tcp, http, wsgi, certutils import netlib.utils import version, app, language, utils @@ -158,13 +158,13 @@ class PathodHandler(tcp.BaseHandler): cc = wsgi.ClientConn(self.client_address) req = wsgi.Request(cc, "http", method, path, headers, content) sn = self.connection.getsockname() - app = wsgi.WSGIAdaptor( + a = wsgi.WSGIAdaptor( self.server.app, sn[0], self.server.port, version.NAMEVERSION ) - app.serve(req, self.wfile) + a.serve(req, self.wfile) return True, None def _log_bytes(self, header, data, hexdump): @@ -257,7 +257,7 @@ class Pathod(tcp.TCPServer): except re.error: raise PathodError("Invalid regex in anchor: %s"%i[0]) try: - aresp = language.parse_response(self.request_settings, i[1]) + language.parse_response(self.request_settings, i[1]) except language.ParseException, v: raise PathodError("Invalid page spec in anchor: '%s', %s"%(i[1], str(v))) self.anchors.append((arex, i[1])) @@ -268,7 +268,7 @@ class Pathod(tcp.TCPServer): """ try: l = req.maximum_length(settings) - except language.FileAccessDenied, v: + except language.FileAccessDenied: return "File access denied." if self.sizelimit and l > self.sizelimit: return "Response too large." 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: diff --git a/libpathod/utils.py b/libpathod/utils.py index 26e9427d..b5dc73c7 100644 --- a/libpathod/utils.py +++ b/libpathod/utils.py @@ -1,4 +1,4 @@ -import os, re +import os SIZE_UNITS = dict( b = 1024**0, diff --git a/libpathod/version.py b/libpathod/version.py index 32dcf30d..43844ed8 100644 --- a/libpathod/version.py +++ b/libpathod/version.py @@ -1,4 +1,4 @@ -IVERSION = (0, 9, 2) +IVERSION = (0, 10) VERSION = ".".join(str(i) for i in IVERSION) NAME = "pathod" NAMEVERSION = NAME + " " + VERSION diff --git a/requirements.txt b/requirements.txt index 73ed126b..c8faa9e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,7 @@ Jinja2>=2.7.1 MarkupSafe>=0.18 Werkzeug>=0.9.4 itsdangerous>=0.23 -nose>=1.3.0 pyOpenSSL>=0.13.1 pyasn1>=0.1.7 requests>=2.1.0 -netlib>=0.9.2
\ No newline at end of file +netlib>=0.10
\ No newline at end of file diff --git a/test/requirements.txt b/test/requirements.txt new file mode 100644 index 00000000..1bfe2b7b --- /dev/null +++ b/test/requirements.txt @@ -0,0 +1,4 @@ +mock>=1.0.1 +nose>=1.3.0 +nose-cov>=1.6 +coveralls>=0.4.1
\ No newline at end of file |