Skip to content
Snippets Groups Projects
Commit e6a41cba authored by Vadim Gelfer's avatar Vadim Gelfer
Browse files

fix windows username problem.

parent 02b6fa7b
No related branches found
No related tags found
No related merge requests found
......@@ -197,7 +197,7 @@
user = os.environ.get("EMAIL")
if user is None:
try:
user = '%s@%s' % (getpass.getuser(), socket.getfqdn())
user = '%s@%s' % (util.getuser(), socket.getfqdn())
except KeyError:
raise util.Abort(_("Please specify a username."))
return user
......
......@@ -12,7 +12,7 @@
from i18n import gettext as _
from demandload import *
demandload(globals(), "cStringIO errno popen2 re shutil sys tempfile")
demandload(globals(), "cStringIO errno getpass popen2 re shutil sys tempfile")
demandload(globals(), "os threading time")
# used by parsedate
......@@ -510,6 +510,17 @@
except AttributeError:
return os.name == 'nt' and 'command' in os.environ.get('comspec', '')
getuser_fallback = None
def getuser():
'''return name of current user'''
try:
return getpass.getuser()
except ImportError:
return getuser_fallback and getuser_fallback()
raise util.Abort(_('user name not available - set USERNAME '
'environment variable'))
# Platform specific variants
if os.name == 'nt':
demandload(globals(), "msvcrt")
......
......@@ -297,3 +297,5 @@
win32file.SetEndOfFile(self.handle)
except pywintypes.error, err:
raise WinIOError(err)
getuser_fallback = win32api.GetUserName
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment