diff --git a/setup.py b/setup.py index aecbf75..1e5a534 100755 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ except: setuptools.setup( name='warcprox', - version='2.1b1.dev50', + version='2.1b1.dev51', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/warcprox/warcproxy.py b/warcprox/warcproxy.py index 64ec738..43b67f1 100644 --- a/warcprox/warcproxy.py +++ b/warcprox/warcproxy.py @@ -343,8 +343,10 @@ class RecordedUrl: self.host = host self.duration = duration - -class SingleThreadedWarcProxy(http_server.HTTPServer): +# inherit from object so that multiple inheritance from this class works +# properly in python 2 +# http://stackoverflow.com/questions/1713038/super-fails-with-error-typeerror-argument-1-must-be-type-not-classobj#18392639 +class SingleThreadedWarcProxy(http_server.HTTPServer, object): logger = logging.getLogger("warcprox.warcproxy.WarcProxy") def __init__(