# HG changeset patch # User Chaiwat Suttipongsakul # Date 1652467400 -25200 # Sat May 14 01:43:20 2022 +0700 # Node ID c5ba28acc392ca77761641a90e15e43b8abc3706 # Parent 66c345ba3264772b7af2971e41376b27c04240bb Import package name as setup.py doesn't work with relative path. diff --git a/.hgignore b/.hgignore new file mode 100644 --- /dev/null +++ b/.hgignore @@ -0,0 +1,3 @@ +build +dist +.egg-info diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ except ImportError: from distutils.core import setup -from wormhole.proxy import VERSION +from wormhole.version import VERSION def readme(): diff --git a/wormhole/handler.py b/wormhole/handler.py --- a/wormhole/handler.py +++ b/wormhole/handler.py @@ -1,8 +1,8 @@ import asyncio from socket import TCP_NODELAY -from logger import get_logger -from tools import get_content_length -from tools import get_host_and_port +from wormhole.logger import get_logger +from wormhole.tools import get_content_length +from wormhole.tools import get_host_and_port async def relay_stream(stream_reader, stream_writer, diff --git a/wormhole/proxy.py b/wormhole/proxy.py --- a/wormhole/proxy.py +++ b/wormhole/proxy.py @@ -1,7 +1,5 @@ #!/usr/bin/env python3 -VERSION = "v2.0.4" - import sys if sys.version_info < (3, 5): print('Error: You need python 3.5.0 or above.') @@ -9,9 +7,10 @@ import asyncio from argparse import ArgumentParser -from license import LICENSE -from logger import get_logger -from server import start_wormhole_server +from wormhole.license import LICENSE +from wormhole.logger import get_logger +from wormhole.server import start_wormhole_server +from wormhole.version import VERSION def main(): diff --git a/wormhole/server.py b/wormhole/server.py --- a/wormhole/server.py +++ b/wormhole/server.py @@ -2,12 +2,12 @@ import functools import sys from time import time -from authentication import get_ident -from authentication import verify -from handler import process_http -from handler import process_https -from handler import process_request -from logger import get_logger +from wormhole.authentication import get_ident +from wormhole.authentication import verify +from wormhole.handler import process_http +from wormhole.handler import process_https +from wormhole.handler import process_request +from wormhole.logger import get_logger MAX_RETRY = 3 diff --git a/wormhole/version.py b/wormhole/version.py new file mode 100644 --- /dev/null +++ b/wormhole/version.py @@ -0,0 +1,2 @@ +VERSION = 'v3.0.0' +