# HG changeset patch # User Aurelien Campeas # Date 1252511927 -7200 # Node ID 93ce849566799ac2495ca266c6c8c3da0472bd93 # Parent 7ef7c82daf598f1341b4eb744920c25c8b045972 fix user login for windows diff -r 7ef7c82daf59 -r 93ce84956679 common/test/unittest_mail.py --- a/common/test/unittest_mail.py Wed Sep 09 17:58:09 2009 +0200 +++ b/common/test/unittest_mail.py Wed Sep 09 17:58:47 2009 +0200 @@ -8,7 +8,7 @@ """ import os -import pwd +import sys from logilab.common.testlib import unittest_main from logilab.common.umessage import message_from_string @@ -22,7 +22,11 @@ (man 3 getlogin) Another solution would be to use $LOGNAME, $USER or $USERNAME """ - return pwd.getpwuid(os.getuid())[0] + if sys.platform != 'win32': + import pwd + return pwd.getpwuid(os.getuid())[0] + else: + return os.environ.get('USERNAME') class EmailTC(EnvBasedTC): diff -r 7ef7c82daf59 -r 93ce84956679 devtools/__init__.py --- a/devtools/__init__.py Wed Sep 09 17:58:09 2009 +0200 +++ b/devtools/__init__.py Wed Sep 09 17:58:47 2009 +0200 @@ -130,7 +130,7 @@ self.set_option('sender-addr', 'cubicweb-test@logilab.fr') try: send_to = '%s@logilab.fr' % os.getlogin() - except OSError: + except (OSError, AttributeError): send_to = '%s@logilab.fr' % (os.environ.get('USER') or os.environ.get('USERNAME') or os.environ.get('LOGNAME'))