---
libbe/ui/util/user.py | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/libbe/ui/util/user.py b/libbe/ui/util/user.py
index 35665e4..0743c65 100644
--- a/libbe/ui/util/user.py
+++ b/libbe/ui/util/user.py
@@ -31,6 +31,7 @@ try:
except ImportErrror: # adjust to old python < 2.5
from email.Utils import formataddr, parseaddr
import os
+import pwd
import re
from socket import gethostname
@@ -40,20 +41,14 @@ import libbe.storage.util.config
def get_fallback_username():
"""Return a username extracted from environmental variables.
"""
- name = None
- for env in ["LOGNAME", "USERNAME"]:
- if os.environ.has_key(env):
- name = os.environ[env]
- break
- assert name != None
- return name
+ pw_ent = pwd.getpwuid(os.getuid())
+ return pw_ent[4].split(',', 1)[0] or pw_ent[0]
def get_fallback_email():
"""Return an email address extracted from environmental variables.
"""
- hostname = gethostname()
- name = get_fallback_username()
- return "%s@%s" % (name, hostname)
+ return os.getenv('EMAIL') or "%s@%s" % (pwd.getpwuid(os.getuid())[0],
+ gethostname())
def create_user_id(name, email=None):
"""Create a user ID string from given `name` and `email` strings.
--
1.7.4.1.622.g7d0c1.dirty
_______________________________________________
Be-devel mailing list
[email protected]
http://void.printf.net/cgi-bin/mailman/listinfo/be-devel
