equal
deleted
inserted
replaced
515 def getuser(): |
515 def getuser(): |
516 '''return name of current user''' |
516 '''return name of current user''' |
517 try: |
517 try: |
518 return getpass.getuser() |
518 return getpass.getuser() |
519 except ImportError: |
519 except ImportError: |
|
520 # import of pwd will fail on windows - try fallback |
520 if getuser_fallback: |
521 if getuser_fallback: |
521 return getuser_fallback() |
522 return getuser_fallback() |
522 raise util.Abort(_('user name not available - set USERNAME ' |
523 # raised if win32api not available |
523 'environment variable')) |
524 raise Abort(_('user name not available - set USERNAME ' |
|
525 'environment variable')) |
524 |
526 |
525 # Platform specific variants |
527 # Platform specific variants |
526 if os.name == 'nt': |
528 if os.name == 'nt': |
527 demandload(globals(), "msvcrt") |
529 demandload(globals(), "msvcrt") |
528 nulldev = 'NUL:' |
530 nulldev = 'NUL:' |