diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 01bb954..0000000 --- a/setup.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[egg_info] -tag_build = dev -tag_svn_revision = true diff --git a/setup.py b/setup.py deleted file mode 100644 index ae6d0b2..0000000 --- a/setup.py +++ /dev/null @@ -1,22 +0,0 @@ -from setuptools import setup, find_packages -from os import path - -def read(fname): - return open(path.join(path.dirname(__file__), fname)).read() - -setup( - name='warcprox', - author='Noah Levitt', - version='1.0', - author_email='nlevitt@archive.org', - description='warcprox - WARC writing MITM HTTP/S proxy', - license='GPL', - url='https://github.com/nlevitt/warcprox', - long_description=read('README.md'), - packages=find_packages('src'), - package_dir={ '' : 'src' }, - install_requires = [ - 'pyopenssl', - 'warctools' - ] -) diff --git a/src/warcprox/__init__.py b/src/warcprox/__init__.py deleted file mode 100644 index 017dfc9..0000000 --- a/src/warcprox/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python - -__author__ = 'Nadeem Douba' -__copyright__ = 'Copyright 2012, Cygnos Corporation' -__credits__ = ['Nadeem Douba'] - -__license__ = 'GPL' -__version__ = '0.1' -__maintainer__ = 'Nadeem Douba' -__email__ = 'ndouba@cygnos.com' -__status__ = 'Development' - -__all__ = [ - 'proxy' -] \ No newline at end of file diff --git a/src/warcprox/warcprox.py b/warcprox.py similarity index 95% rename from src/warcprox/warcprox.py rename to warcprox.py index 117c4d7..8140a62 100755 --- a/src/warcprox/warcprox.py +++ b/warcprox.py @@ -2,12 +2,6 @@ # vim:set sw=4 et: # -# python3 imports -# from http.server import HTTPServer, BaseHTTPRequestHandler -# from urllib.parse import urlparse, urlunparse, ParseResult -# from socketserver import ThreadingMixIn -# from http.client import HTTPResponse - import BaseHTTPServer, SocketServer import httplib import socket @@ -20,31 +14,10 @@ from hanzo import warctools import uuid import hashlib from datetime import datetime -import time import Queue import threading -import os.path +import os, os.path import argparse -import os - -__author__ = 'Nadeem Douba' -__copyright__ = 'Copyright 2012, PyMiProxy Project' -__credits__ = ['Nadeem Douba'] - -__license__ = 'GPL' -__version__ = '0.1' -__maintainer__ = 'Nadeem Douba' -__email__ = 'ndouba@gmail.com' -__status__ = 'Development' - -__all__ = [ - 'ProxyHandler', - 'RequestInterceptorPlugin', - 'ResponseInterceptorPlugin', - 'MitmProxy', - 'AsyncMitmProxy', - 'InvalidInterceptorPluginException' -] class UnsupportedSchemeException(Exception):