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

Merge pull request #6 from ahaberlie/master

Browse source 
Fix for importing pwd module issues on Windows machines
This commit is contained in:
Michael James 2016-06-03 14:46:07 -06:00
commit 11439d0074
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -20,13 +20,22 @@
# File auto-generated against equivalent DynamicSerialize Java class # 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): class UserId(object):
def __init__(self, id = None): def __init__(self, id = None):
if id is None: if id is None:
if not pwd_error:
self.id = pwd.getpwuid(os.getuid()).pw_name self.id = pwd.getpwuid(os.getuid()).pw_name
else:
self.id = "GenericUsername"
else: else:
self.id = id self.id = id