pylint cleanups

(Logical change 1.161)


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@717 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py
index 82748b0b3..dad5ee0cb 100644
--- a/src/lib/Server/Core.py
+++ b/src/lib/Server/Core.py
@@ -96,11 +96,11 @@ class Core(object):
             except:
                 print "Unexpected initiantiation failure for generator %s" % gen.__name__
                 syslog(LOG_ERR, "Unexpected initiantiation failure for generator %s" % gen.__name__)
-                (t, v, tb)=exc_info()
-                for line in extract_tb(tb):
+                (trace, val, trb)=exc_info()
+                for line in extract_tb(trb):
                     syslog(LOG_ERR, '  File "%s", line %i, in %s\n    %s\n'%line)
-                syslog(LOG_ERR, "%s: %s\n"%(t, v))
-                del t, v, tb
+                syslog(LOG_ERR, "%s: %s\n"%(trace, val))
+                del trace, val, trb
         # we need to inventory and setup generators
         # Process generator requirements
         for gen in self.generators:
@@ -138,7 +138,7 @@ class Core(object):
         for entry in [child for child in structure.getchildren() if child.tag not in ['SymLink', 'Directory']]:
             try:
                 self.Bind(entry, metadata)
-            except GeneratorError, key:
+            except GeneratorError:
                 syslog(LOG_ERR, "Failed to bind entry: %s %s" %  (entry.tag, entry.get('name')))
 
     def Bind(self, entry, metadata):