projects
/
svn42.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1e23e59
)
fix fucking tab indentation
author
Bernhard Tittelbach
<xro@realraum.at>
Sun, 8 Aug 2010 13:52:14 +0000
(13:52 +0000)
committer
Bernhard Tittelbach
<xro@realraum.at>
Sun, 8 Aug 2010 13:52:14 +0000
(13:52 +0000)
play-sound-status.py
patch
|
blob
|
history
diff --git
a/play-sound-status.py
b/play-sound-status.py
index
f0a3f4d
..
6daf67c
100755
(executable)
--- 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:])
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
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:
def __getattr__(self, name):
underscore_pos=name.find('_')
if underscore_pos < 0:
@@
-151,11
+151,10
@@
class UWSConfig:
def runRandomAction(action_list,user,args=[]):
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
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":
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)
else:
return executeAction(action_type,user=user,args=args)