X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=play-sound-status.py;h=2c30122b2dacee2d806ad2a223e00f8508c14e32;hb=df4d8e39e6182abf7a7b983e4db458420f5a091c;hp=f0a3f4d80574ca2d1eb953c47af4a287a954a05d;hpb=1e23e593f62df3a15f91b8176c6642e0cb924c33;p=svn42.git diff --git a/play-sound-status.py b/play-sound-status.py index f0a3f4d..2c30122 100755 --- a/play-sound-status.py +++ b/play-sound-status.py @@ -134,12 +134,12 @@ class UWSConfig: raise AttributeError return self.getSectionValue(name[0:underscore_pos], name[underscore_pos+1:]) - def getSectionValue(self, section, name): + def getSectionValue(self, section, name): try: return self.config_parser.get(section,name) except (ConfigParser.NoOptionError, ConfigParser.NoSectionError): return None - + def __getattr__(self, name): underscore_pos=name.find('_') if underscore_pos < 0: @@ -151,11 +151,10 @@ class UWSConfig: def runRandomAction(action_list,user,args=[]): - global uwscfg - if not type(action_list) == types.ListType): - raise ValueError("runRandomAction: action_list must be a list") - return executeAction(random.choice(action_list),user,args) - + if not type(action_list) == types.ListType: + raise ValueError("runRandomAction: action_list must be a list") + return executeAction(random.choice(action_list),user,args) + def runRemoteCommand(remote_host,remote_shell,user,args=[]): global sshp,uwscfg sshp = None @@ -218,7 +217,7 @@ def executeAction(action_name, user, args=[]): elif action_type == "nothing": return True elif action_type == "random": - return runRandomAction(action_list=uwscfg.getSectionValue(action_name,"one_of").split(" "),user=user,args=args) + return runRandomAction(action_list=uwscfg.getSectionValue(action_name,"one_of").split(" "),user=user,args=args) else: return executeAction(action_type,user=user,args=args)