merge

Author: mmatera

mathics/builtin/system.py

@@ -408,10 +408,11 @@ class UserName(Predefined):
 
     def evaluate(self, evaluation) -> String:
         try:
-            return String(os.getlogin())
+            user = os.getlogin()
         except:
             import pwd
-            return String(pwd.getpwuid(os.getuid())[0])
+            user = pwd.getpwuid(os.getuid())[0]
+        return String(user)
 
 
 class Version(Predefined):