mirror of https://gitlab.com/pamhyr/pamhyr2
Windows: Fix 'pwd' import.
parent
8c9eeb6160
commit
d158c8ad7a
10
src/tools.py
10
src/tools.py
|
|
@ -17,7 +17,6 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import pwd
|
|
||||||
import time
|
import time
|
||||||
import logging
|
import logging
|
||||||
import traceback
|
import traceback
|
||||||
|
|
@ -33,6 +32,13 @@ from functools import (
|
||||||
reduce, partial, wraps
|
reduce, partial, wraps
|
||||||
)
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
import pwd
|
||||||
|
with_pwd = True
|
||||||
|
except Exception as e:
|
||||||
|
print("Module 'pwd' is not available")
|
||||||
|
with_pwd = False
|
||||||
|
|
||||||
###########
|
###########
|
||||||
# LOGGING #
|
# LOGGING #
|
||||||
###########
|
###########
|
||||||
|
|
@ -273,7 +279,7 @@ def timestamp_to_old_pamhyr_date(time: int):
|
||||||
|
|
||||||
|
|
||||||
def get_user_name():
|
def get_user_name():
|
||||||
if posix:
|
if with_pwd:
|
||||||
return pwd.getpwuid(os.getuid()).pw_gecos
|
return pwd.getpwuid(os.getuid()).pw_gecos
|
||||||
else:
|
else:
|
||||||
return "Me"
|
return "Me"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue