Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ResourceWarning in moto.settings.is_docker(). (#5060)

Browse Source
This commit is contained in:
Nick Pope 2022-04-25 21:17:49 +01:00 committed by GitHub
parent afe4b3ace9
commit d12254309d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
moto/settings.py
View File

@ -1,5 +1,6 @@
import json import json
import os import os
import pathlib
from functools import lru_cache from functools import lru_cache
@ -85,11 +86,11 @@ def test_server_mode_endpoint():
def is_docker(): def is_docker():
path = "/proc/self/cgroup" path = pathlib.Path("/proc/self/cgroup")
return ( return (
os.path.exists("/.dockerenv") os.path.exists("/.dockerenv")
or os.path.isfile(path) or path.is_file()
and any("docker" in line for line in open(path)) and any("docker" in line for line in path.read_text())
) )