netlib.version -> mitmproxy.version

This commit is contained in:
Aldo Cortesi 2016-10-20 09:20:44 +13:00
parent ee56d3fae0
commit 7440232f60
16 changed files with 18 additions and 17 deletions

View File

@ -5,7 +5,7 @@ import subprocess
import sys import sys
sys.path.insert(0, os.path.abspath('..')) sys.path.insert(0, os.path.abspath('..'))
import netlib.version from mitmproxy import version
extensions = [ extensions = [
@ -47,9 +47,9 @@ author = u'The mitmproxy project'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = netlib.version.VERSION version = version.VERSION
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = netlib.version.VERSION release = version.VERSION
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

View File

@ -14,7 +14,7 @@ import pytz
import mitmproxy import mitmproxy
from netlib import version from mitmproxy import version
from netlib import strutils from netlib import strutils
from netlib.http import cookies from netlib.http import cookies

View File

@ -2,7 +2,7 @@ from mitmproxy import ctx
from mitmproxy import exceptions from mitmproxy import exceptions
from netlib import wsgi from netlib import wsgi
from netlib import version from mitmproxy import version
class WSGIApp: class WSGIApp:

View File

@ -4,8 +4,8 @@ import uuid
from mitmproxy import stateobject from mitmproxy import stateobject
from mitmproxy import connections from mitmproxy import connections
from mitmproxy import version
from netlib import version
from typing import Optional # noqa from typing import Optional # noqa

View File

@ -2,7 +2,7 @@ import cgi
from mitmproxy import flow from mitmproxy import flow
from netlib import http from netlib import http
from netlib import version from mitmproxy import version
from netlib import tcp from netlib import tcp

View File

@ -4,7 +4,8 @@ This module handles the import of mitmproxy flows generated by old versions.
from typing import Any from typing import Any
from netlib import version, strutils from mitmproxy import version
from netlib import strutils
def convert_011_012(data): def convert_011_012(data):

View File

@ -7,7 +7,7 @@ from mitmproxy import options
from mitmproxy import platform from mitmproxy import platform
from netlib import human from netlib import human
from netlib import tcp from netlib import tcp
from netlib import version from mitmproxy import version
class ParseException(Exception): class ParseException(Exception):

View File

@ -6,7 +6,7 @@ from mitmproxy import flowfilter
from mitmproxy.tools.console import common from mitmproxy.tools.console import common
from mitmproxy.tools.console import signals from mitmproxy.tools.console import signals
from netlib import version from mitmproxy import version
footer = [ footer = [
("heading", 'mitmproxy {} (Python {}) '.format(version.VERSION, platform.python_version())), ("heading", 'mitmproxy {} (Python {}) '.format(version.VERSION, platform.python_version())),

View File

@ -15,7 +15,7 @@ from mitmproxy import flow
from mitmproxy import http from mitmproxy import http
from mitmproxy import contentviews from mitmproxy import contentviews
from mitmproxy import io from mitmproxy import io
from netlib import version from mitmproxy import version
def convert_flow_to_json_dict(flow: flow.Flow) -> dict: def convert_flow_to_json_dict(flow: flow.Flow) -> dict:

View File

@ -6,7 +6,7 @@ import signal
import platform import platform
import traceback import traceback
from netlib import version from mitmproxy import version
from OpenSSL import SSL from OpenSSL import SSL

View File

@ -4,7 +4,7 @@ import os
import os.path import os.path
from netlib import tcp from netlib import tcp
from netlib import version from mitmproxy import version
from netlib.http import user_agents from netlib.http import user_agents
from . import pathoc, language from . import pathoc, language

View File

@ -7,7 +7,7 @@ import threading
from netlib import tcp from netlib import tcp
from netlib import certutils from netlib import certutils
from netlib import websockets from netlib import websockets
from netlib import version from mitmproxy import version
import urllib import urllib
from netlib.exceptions import HttpException, HttpReadDisconnect, TcpTimeout, TcpDisconnect, \ from netlib.exceptions import HttpException, HttpReadDisconnect, TcpTimeout, TcpDisconnect, \

View File

@ -6,7 +6,7 @@ import re
from netlib import tcp from netlib import tcp
from netlib import human from netlib import human
from netlib import version from mitmproxy import version
from . import pathod from . import pathod

View File

@ -1,4 +1,4 @@
from netlib import version from mitmproxy import version
from netlib.exceptions import TlsException from netlib.exceptions import TlsException
from netlib.http import http1 from netlib.http import http1
from .. import language from .. import language

View File

@ -2,7 +2,7 @@ from setuptools import setup, find_packages
from codecs import open from codecs import open
import os import os
from netlib import version from mitmproxy import version
# Based on https://github.com/pypa/sampleproject/blob/master/setup.py # Based on https://github.com/pypa/sampleproject/blob/master/setup.py
# and https://python-packaging-user-guide.readthedocs.org/ # and https://python-packaging-user-guide.readthedocs.org/