aboutsummaryrefslogtreecommitdiffstats
path: root/libpathod
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-06-07 14:05:42 +1200
committerAldo Cortesi <aldo@nullcube.com>2012-06-07 14:05:42 +1200
commit26c8437e884f310ea80ed31209d3c926ced400e5 (patch)
tree92b8aa6c827973217724ec9ed6b885240efb0ebd /libpathod
parent34ffe46fa0474a47bc737669ccd58fe036e3a033 (diff)
downloadmitmproxy-26c8437e884f310ea80ed31209d3c926ced400e5.tar.gz
mitmproxy-26c8437e884f310ea80ed31209d3c926ced400e5.tar.bz2
mitmproxy-26c8437e884f310ea80ed31209d3c926ced400e5.zip
Better test daemon cleanup, improve utils test coverage.
Diffstat (limited to 'libpathod')
-rw-r--r--libpathod/pathod.py1
-rw-r--r--libpathod/utils.py9
2 files changed, 0 insertions, 10 deletions
diff --git a/libpathod/pathod.py b/libpathod/pathod.py
index 6012abc1..ae7aa5ca 100644
--- a/libpathod/pathod.py
+++ b/libpathod/pathod.py
@@ -261,5 +261,4 @@ def make_server(application, port, address, ssl_options):
def run(server):
tornado.ioloop.IOLoop.instance().start()
server.stop()
- tornado.ioloop.IOLoop.instance().close()
diff --git a/libpathod/utils.py b/libpathod/utils.py
index 46b252dd..0e3bda9d 100644
--- a/libpathod/utils.py
+++ b/libpathod/utils.py
@@ -67,14 +67,5 @@ class Data:
raise ValueError, "dataPath: %s does not exist."%fullpath
return fullpath
- def read(self, path):
- """
- Returns a path to the package data housed at 'path' under this
- module.Path can be a path to a file, or to a directory.
-
- This function will raise ValueError if the path does not exist.
- """
- p = self.path(path)
- return open(p).read()
data = Data(__name__)