mirror of
https://github.com/Unidata/python-awips.git
synced 2025-02-23 22:57:56 -05:00
Merge branch 'master' of github.com:Unidata/python-awips
This commit is contained in:
commit
a662fb173d
3 changed files with 494 additions and 114 deletions
|
@ -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:
|
||||||
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:
|
||||||
|
|
|
@ -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:
|
||||||
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:
|
else:
|
||||||
self.id = id
|
self.id = id
|
||||||
|
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Add table
Reference in a new issue