Fix for restarting since Python 3.

pull/712/head
Louis Vézina 5 years ago
parent e6cb1b1a8f
commit 1eb174d9ef

@ -45,7 +45,10 @@ def start_bazarr():
ep = sp.Popen(script, stdout=sp.PIPE, stderr=sp.STDOUT, stdin=sp.PIPE) ep = sp.Popen(script, stdout=sp.PIPE, stderr=sp.STDOUT, stdin=sp.PIPE)
print("Bazarr starting...") print("Bazarr starting...")
try: try:
for line in iter(ep.stdout.readline, ''): while True:
line = ep.stdout.readline()
if line == '' or not line:
break
if PY3: if PY3:
sys.stdout.buffer.write(line) sys.stdout.buffer.write(line)
else: else:

@ -2251,7 +2251,7 @@ def api_help():
# Mute DeprecationWarning # Mute DeprecationWarning
warnings.simplefilter("ignore", DeprecationWarning) warnings.simplefilter("ignore", (DeprecationWarning, BrokenPipeError))
server = CherryPyWSGIServer((str(settings.general.ip), (int(args.port) if args.port else int(settings.general.port))), app) server = CherryPyWSGIServer((str(settings.general.ip), (int(args.port) if args.port else int(settings.general.port))), app)
try: try:
logging.info('BAZARR is started and waiting for request on http://' + str(settings.general.ip) + ':' + (str( logging.info('BAZARR is started and waiting for request on http://' + str(settings.general.ip) + ':' + (str(

@ -41,7 +41,11 @@ import base64, cgi, email.utils, functools, hmac, imp, itertools, mimetypes,\
from datetime import date as datedate, datetime, timedelta from datetime import date as datedate, datetime, timedelta
from tempfile import TemporaryFile from tempfile import TemporaryFile
from traceback import format_exc, print_exc from traceback import format_exc, print_exc
from six import PY2
if PY2:
from inspect import getargspec from inspect import getargspec
else:
from inspect import getfullargspec as getargspec
from unicodedata import normalize from unicodedata import normalize

Loading…
Cancel
Save