Merge branch 'master' of github.com:Unidata/python-awips

dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py

@@ -30,9 +30,14 @@
 import struct
 import socket
 import os
-import pwd
 import thread
 
+try:
+    import pwd
+    pwd_error = False
+except ImportError:
+    pwd_error = True
+
 class WsId(object):
 
     def __init__(self, networkId=None, userName=None, progName=None):
@@ -42,7 +47,10 @@ class WsId(object):
 
         self.userName = userName
         if userName is None:
-            self.userName = pwd.getpwuid(os.getuid()).pw_name
+            if not pwd_error:
+               self.userName = pwd.getpwuid(os.getuid()).pw_name
+            else:
+               self.userName = "GenericUsername"
 
         self.progName = progName
         if progName is None:

dynamicserialize/dstypes/com/raytheon/uf/common/plugin/nwsauth/user/UserId.py

@@ -20,13 +20,22 @@
 
 # File auto-generated against equivalent DynamicSerialize Java class
 
-import os, pwd
+import os
+
+try:
+    import pwd
+    pwd_error = False
+except ImportError:
+    pwd_error = True
 
 class UserId(object):
 
     def __init__(self, id = None):
         if id is None:
-           self.id = pwd.getpwuid(os.getuid()).pw_name
+           if not pwd_error:
+              self.id = pwd.getpwuid(os.getuid()).pw_name
+           else:
+              self.id = "GenericUsername"
         else:
            self.id = id