Commit 6bd3e444 authored by R David Murray's avatar R David Murray

Merge #14984: only import pwd on POSIX.

Since we have fine grained import locks in 3.4, I moved the
import to where it is actually needed.
parents cf6d0e77 4b49ae61
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Module and documentation by Eric S. Raymond, 21 Dec 1998 # Module and documentation by Eric S. Raymond, 21 Dec 1998
import io, os, shlex, stat, pwd import os, shlex, stat
__all__ = ["netrc", "NetrcParseError"] __all__ = ["netrc", "NetrcParseError"]
...@@ -90,6 +90,7 @@ class netrc: ...@@ -90,6 +90,7 @@ class netrc:
if os.name == 'posix' and default_netrc: if os.name == 'posix' and default_netrc:
prop = os.fstat(fp.fileno()) prop = os.fstat(fp.fileno())
if prop.st_uid != os.getuid(): if prop.st_uid != os.getuid():
import pwd
try: try:
fowner = pwd.getpwuid(prop.st_uid)[0] fowner = pwd.getpwuid(prop.st_uid)[0]
except KeyError: except KeyError:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment