mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-08-08 23:13:50 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/server.py
This commit is contained in:
Ozzie Isaacs 2023-02-18 14:23:58 +01:00
commit 3cb9a9b04a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cps/server.py
View File

@ -152,7 +152,7 @@ class WebServer(object):
# The value of __package__ indicates how Python was called. It may # The value of __package__ indicates how Python was called. It may
# not exist if a setuptools script is installed as an egg. It may be # not exist if a setuptools script is installed as an egg. It may be
# set incorrectly for entry points created with pip on Windows. # set incorrectly for entry points created with pip on Windows.
if getattr(__main__, "__package__", "") == "" or ( if getattr(__main__, "__package__", "") in ["", None] or (
os.name == "nt" os.name == "nt"
and __main__.__package__ == "" and __main__.__package__ == ""
and not os.path.exists(py_script) and not os.path.exists(py_script)
@ -265,7 +265,7 @@ class WebServer(object):
if os.environ.get('FLASK_DEBUG'): if os.environ.get('FLASK_DEBUG'):
subprocess.run(args, close_fds=True) # nosec subprocess.run(args, close_fds=True) # nosec
else: else:
subprocess.Popen(args, close_fds=True) # nosec subprocess.Popen(args, close_fds=True) # nosec
return True return True
@staticmethod @staticmethod