Commit 4eec81d9 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

py2/py3: remove deprecated splitport().

parent b8c8fe82
...@@ -10,10 +10,6 @@ import sys ...@@ -10,10 +10,6 @@ import sys
from tempfile import TemporaryFile from tempfile import TemporaryFile
import time import time
from six.moves.urllib.parse import quote from six.moves.urllib.parse import quote
try:
from urllib import splitport
except ImportError: # six.PY3
from urllib.parse import splitport
from waitress.server import create_server from waitress.server import create_server
import ZConfig import ZConfig
...@@ -234,12 +230,10 @@ def runwsgi(): ...@@ -234,12 +230,10 @@ def runwsgi():
interval=args.timerserver_interval, interval=args.timerserver_interval,
) )
ip, port = splitport(args.address)
port = int(port)
createServer( createServer(
app_wrapper( app_wrapper(
large_file_threshold=getattr(conf, 'large_file_threshold', None), large_file_threshold=getattr(conf, 'large_file_threshold', None),
webdav_ports=[port] if args.webdav else ()), webdav_ports=[int(args.address.rsplit(':', 1)[1])] if args.webdav else ()),
listen=args.address, listen=args.address,
logger=access_log_logger, logger=access_log_logger,
threads=getattr(conf, 'zserver_threads', 4), threads=getattr(conf, 'zserver_threads', 4),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment