xan/python-awips
1
0
Fork 0
mirror of https://github.com/Unidata/python-awips.git synced 2025-02-23 14:57:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

small changes

Browse source
This commit is contained in:
mjames-upc 2018-09-06 21:58:42 -06:00
parent e12e492c42
commit aff9f8e933
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dynamicserialize/dstypes/com/raytheon/uf/common/message/Header.py
View file

@ -14,7 +14,7 @@ class Header(object):
self.properties = properties self.properties = properties
if multimap is not None: if multimap is not None:
for k, l in multimap.iteritems(): for k, l in multimap.items():
for v in l: for v in l:
self.properties.append(Property(k, v)) self.properties.append(Property(k, v))

13
dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py
View file

@ -15,7 +15,11 @@
import struct import struct
import socket import socket
import os import os
import pwd try:
import pwd
pwd_error = False
except ImportError:
pwd_error = True
try: try:
import _thread import _thread
except ImportError: except ImportError:
@ -30,7 +34,10 @@ class WsId(object):
self.userName = userName self.userName = userName
if userName is None: 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 self.progName = progName
if progName is None: if progName is None:
@ -38,7 +45,7 @@ class WsId(object):
self.pid = os.getpid() self.pid = os.getpid()
self.threadId = int(thread.get_ident()) self.threadId = int(_thread.get_ident())
def getNetworkId(self): def getNetworkId(self):
return self.networkId return self.networkId