diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-07-23 16:18:47 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-07-23 16:18:47 +1200 |
| commit | 773ada882dcd21bcb71d82cd69c1cd96d230c0e0 (patch) | |
| tree | ed8e6adb94e4836e5034ff985f9bb237afa9d68c /libpathod | |
| parent | 3027aae142c12b123715e1cb0ecc770f00d27198 (diff) | |
| download | mitmproxy-773ada882dcd21bcb71d82cd69c1cd96d230c0e0.tar.gz mitmproxy-773ada882dcd21bcb71d82cd69c1cd96d230c0e0.tar.bz2 mitmproxy-773ada882dcd21bcb71d82cd69c1cd96d230c0e0.zip | |
Unit tests for most of app.py, return 404 for unknown log entry.
Diffstat (limited to 'libpathod')
| -rw-r--r-- | libpathod/app.py | 7 | ||||
| -rw-r--r-- | libpathod/test.py | 1 | ||||
| -rw-r--r-- | libpathod/utils.py | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libpathod/app.py b/libpathod/app.py index 4b5758a0..b8e1ccdd 100644 --- a/libpathod/app.py +++ b/libpathod/app.py @@ -1,5 +1,5 @@ import logging, pprint, cStringIO -from flask import Flask, jsonify, render_template, request +from flask import Flask, jsonify, render_template, request, abort import version, rparse logging.basicConfig(level="DEBUG") @@ -58,7 +58,10 @@ def log(): @app.route('/log/<int:lid>') def onelog(lid): - l = pprint.pformat(app.config["pathod"].log_by_id(int(lid))) + item = app.config["pathod"].log_by_id(int(lid)) + if not item: + abort(404) + l = pprint.pformat(item) return render_template("onelog.html", section="log", alog=l, lid=lid) diff --git a/libpathod/test.py b/libpathod/test.py index b90c8de6..ff5dac30 100644 --- a/libpathod/test.py +++ b/libpathod/test.py @@ -1,7 +1,6 @@ import json, threading, Queue import requests import pathod, utils -import tutils IFACE = "127.0.0.1" diff --git a/libpathod/utils.py b/libpathod/utils.py index de83b19a..311d8f77 100644 --- a/libpathod/utils.py +++ b/libpathod/utils.py @@ -1,5 +1,4 @@ import os, re -import rparse SIZE_UNITS = dict( b = 1024**0, |