bpo-41718: subprocess imports grp and pwd on demand (GH-24987)

The shutil and subprocess modules now only import the grp and pwd
modules when they are needed, which is not the case by default in
subprocess.
This commit is contained in:
Victor Stinner 2021-03-23 17:42:51 +01:00 committed by GitHub
parent 76b5d714e4
commit d72e8d4875
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 24 deletions

View file

@ -32,16 +32,6 @@ try:
except ImportError:
_LZMA_SUPPORTED = False
try:
from pwd import getpwnam
except ImportError:
getpwnam = None
try:
from grp import getgrnam
except ImportError:
getgrnam = None
_WINDOWS = os.name == 'nt'
posix = nt = None
if os.name == 'posix':
@ -843,8 +833,14 @@ def _is_immutable(src):
def _get_gid(name):
"""Returns a gid, given a group name."""
if getgrnam is None or name is None:
if name is None:
return None
try:
from grp import getgrnam
except ImportError:
return None
try:
result = getgrnam(name)
except KeyError:
@ -855,8 +851,14 @@ def _get_gid(name):
def _get_uid(name):
"""Returns an uid, given a user name."""
if getpwnam is None or name is None:
if name is None:
return None
try:
from pwd import getpwnam
except ImportError:
return None
try:
result = getpwnam(name)
except KeyError: