summaryrefslogtreecommitdiffstats
path: root/src/lib/Client/Frame.py
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2008-12-08 03:52:27 +0000
committerNarayan Desai <desai@mcs.anl.gov>2008-12-08 03:52:27 +0000
commit2dd81e93aa03a3c974ce492cb07458ea9417e3b8 (patch)
tree0e740484abdb50bbc3d8c0834078a5345ef9e4b5 /src/lib/Client/Frame.py
parent6ac0ad8babaee28757bc6d9372bf1ecf6ee16bd4 (diff)
downloadbcfg2-2dd81e93aa03a3c974ce492cb07458ea9417e3b8.tar.gz
bcfg2-2dd81e93aa03a3c974ce492cb07458ea9417e3b8.tar.bz2
bcfg2-2dd81e93aa03a3c974ce492cb07458ea9417e3b8.zip
pylint fixes for client code
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4991 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client/Frame.py')
-rw-r--r--src/lib/Client/Frame.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/Client/Frame.py b/src/lib/Client/Frame.py
index 6d778f6ba..71c4addc8 100644
--- a/src/lib/Client/Frame.py
+++ b/src/lib/Client/Frame.py
@@ -83,10 +83,10 @@ class Frame:
for tool in self.tools[:]:
for conflict in getattr(tool, 'conflicts', []):
[self.tools.remove(item) for item in self.tools \
- if item.__name__ == conflict]
+ if item.name == conflict]
self.logger.info("Loaded tool drivers:")
- self.logger.info([tool.__name__ for tool in self.tools])
+ self.logger.info([tool.name for tool in self.tools])
if not self.dryrun and not self.setup['bundle']:
for cfile in [cfl for cfl in config.findall(".//ConfigFile") \
if cfl.get('name') in self.__important__]:
@@ -142,7 +142,7 @@ class Frame:
try:
tool.Inventory(self.states)
except:
- self.logger.error("%s.Inventory() call failed:" % tool.__name__, exc_info=1)
+ self.logger.error("%s.Inventory() call failed:" % tool.name, exc_info=1)
def Decide(self):
'''Set self.whitelist based on user interaction'''
@@ -239,7 +239,7 @@ class Frame:
try:
tool.Install(handled, self.states)
except:
- self.logger.error("%s.Install() call failed:" % tool.__name__, exc_info=1)
+ self.logger.error("%s.Install() call failed:" % tool.name, exc_info=1)
def Install(self):
'''Install all entries'''
@@ -259,7 +259,7 @@ class Frame:
try:
tool.Inventory(self.states, [bundle])
except:
- self.logger.error("%s.Inventory() call failed:" % tool.__name__, exc_info=1)
+ self.logger.error("%s.Inventory() call failed:" % tool.name, exc_info=1)
clobbered = [entry for bundle in mbundles for entry in bundle \
if not self.states[entry] and entry not in self.blacklist]
if clobbered:
@@ -278,7 +278,7 @@ class Frame:
tool.BundleNotUpdated(bundle, self.states)
except:
self.logger.error("%s.BundleNotUpdated() call failed:" % \
- (tool.__name__), exc_info=1)
+ (tool.name), exc_info=1)
def Remove(self):
'''Remove extra entries'''
@@ -288,7 +288,7 @@ class Frame:
try:
tool.Remove(extras)
except:
- self.logger.error("%s.Remove() failed" % tool.__name__, exc_info=1)
+ self.logger.error("%s.Remove() failed" % tool.name, exc_info=1)
def CondDisplayState(self, phase):
'''Conditionally print tracing information'''