Merge pull request #9871 from paulmueller/getpass-import-error
fix: move 'import getpass' statement to try-clause
This commit is contained in:
commit
28e8c8582e
1
AUTHORS
1
AUTHORS
|
@ -256,6 +256,7 @@ Ondřej Súkup
|
|||
Oscar Benjamin
|
||||
Parth Patel
|
||||
Patrick Hayes
|
||||
Paul Müller
|
||||
Pauli Virtanen
|
||||
Pavel Karateev
|
||||
Paweł Adamczak
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fix a bizarre (and fortunately rare) bug where the `temp_path` fixture could raise
|
||||
an internal error while attempting to get the current user's username.
|
|
@ -158,9 +158,10 @@ class TempPathFactory:
|
|||
def get_user() -> Optional[str]:
|
||||
"""Return the current user name, or None if getuser() does not work
|
||||
in the current environment (see #1010)."""
|
||||
import getpass
|
||||
|
||||
try:
|
||||
# In some exotic environments, getpass may not be importable.
|
||||
import getpass
|
||||
|
||||
return getpass.getuser()
|
||||
except (ImportError, KeyError):
|
||||
return None
|
||||
|
|
Loading…
Reference in New Issue