From aff9f8e9339de90346b54480b803ba4009397a96 Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Thu, 6 Sep 2018 21:58:42 -0600
Subject: [PATCH] small changes

---
 .../com/raytheon/uf/common/message/Header.py      |  2 +-
 .../com/raytheon/uf/common/message/WsId.py        | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py
index 7b01177..a556ccd 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py
@@ -14,7 +14,7 @@ class Header(object):
             self.properties = properties
 
         if multimap is not None:
-            for k, l in multimap.iteritems():
+            for k, l in multimap.items():
                 for v in l:
                     self.properties.append(Property(k, v))
 
diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
index 36b2369..63f9aa9 100644
--- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
+++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
@@ -15,7 +15,11 @@
 import struct
 import socket
 import os
-import pwd
+try:
+    import pwd
+    pwd_error = False
+except ImportError:
+    pwd_error = True
 try:
     import _thread
 except ImportError:
@@ -30,7 +34,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:
@@ -38,7 +45,7 @@ class WsId(object):
 
         self.pid = os.getpid()
 
-        self.threadId = int(thread.get_ident())
+	self.threadId = int(_thread.get_ident())
 
     def getNetworkId(self):
         return self.networkId
@@ -78,4 +85,4 @@ class WsId(object):
         return self.networkId + ":" + self.userName + ":" + self.progName + ":" + str(self.pid) + ":" + str(self.threadId)
 
     def __repr__(self):
-        return self.__str__()
\ No newline at end of file
+        return self.__str__()