mirror of
https://github.com/jupyter/docker-stacks.git
synced 2025-10-13 13:02:56 +00:00
Replace os with pathlib where paths are used (#1984)
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
import os
|
||||
import stat
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
from jupyter_core.paths import jupyter_data_dir
|
||||
|
||||
@@ -24,15 +25,14 @@ distinguished_name = req_distinguished_name
|
||||
[req_distinguished_name]
|
||||
"""
|
||||
if "GEN_CERT" in os.environ:
|
||||
dir_name = jupyter_data_dir()
|
||||
pem_file = os.path.join(dir_name, "notebook.pem")
|
||||
os.makedirs(dir_name, exist_ok=True)
|
||||
dir_name = Path(jupyter_data_dir())
|
||||
dir_name.mkdir(parents=True, exist_ok=True)
|
||||
pem_file = dir_name / "notebook.pem"
|
||||
|
||||
# Generate an openssl.cnf file to set the distinguished name
|
||||
cnf_file = os.path.join(os.getenv("CONDA_DIR", "/usr/lib"), "ssl", "openssl.cnf")
|
||||
if not os.path.isfile(cnf_file):
|
||||
with open(cnf_file, "w") as fh:
|
||||
fh.write(OPENSSL_CONFIG)
|
||||
cnf_file = Path(os.getenv("CONDA_DIR", "/usr/lib")) / "ssl/openssl.cnf"
|
||||
if not cnf_file.exists():
|
||||
cnf_file.write_text(OPENSSL_CONFIG)
|
||||
|
||||
# Generate a certificate if one doesn't exist on disk
|
||||
subprocess.check_call(
|
||||
@@ -50,8 +50,8 @@ if "GEN_CERT" in os.environ:
|
||||
]
|
||||
)
|
||||
# Restrict access to the file
|
||||
os.chmod(pem_file, stat.S_IRUSR | stat.S_IWUSR)
|
||||
c.ServerApp.certfile = pem_file
|
||||
pem_file.chmod(stat.S_IRUSR | stat.S_IWUSR)
|
||||
c.ServerApp.certfile = str(pem_file)
|
||||
|
||||
# Change default umask for all subprocesses of the Server if set in the environment
|
||||
if "NB_UMASK" in os.environ:
|
||||
|
Reference in New Issue
Block a user