Permalink
Browse files

Pylint cleanup round 6.

  • Loading branch information...
1 parent e831486 commit f6b90cb1e7b9d6cd170047f0ee55951a14fc53c2 @jk0 jk0 committed Oct 23, 2011
Showing with 12 additions and 12 deletions.
  1. +4 −4 bin/pyhole
  2. +2 −2 pyhole/irc.py
  3. +6 −6 pyhole/plugin.py
View
@@ -53,8 +53,8 @@ class IRCConnection(multiprocessing.Process):
while True:
try:
connection = irc.IRC(self.irc_network)
- except Exception, e:
- LOG.error(e)
+ except Exception, exc:
+ LOG.error(exc)
LOG.error("Retrying in %d seconds" % reconnect_delay)
time.sleep(reconnect_delay)
continue
@@ -63,8 +63,8 @@ class IRCConnection(multiprocessing.Process):
connection.start()
except KeyboardInterrupt:
sys.exit(0)
- except Exception, e:
- LOG.error(e)
+ except Exception, exc:
+ LOG.error(exc)
LOG.error("Retrying in %d seconds" % reconnect_delay)
time.sleep(reconnect_delay)
continue
View
@@ -83,8 +83,8 @@ def run_hook_command(self, mod_name, func, arg, **kwargs):
else:
self.log.debug("Calling: %s.%s(None)" % (mod_name,
func.__name__))
- except Exception, e:
- self.log.error(e)
+ except Exception, exc:
+ self.log.error(exc)
def run_msg_regexp_hooks(self, message, private):
"""Run regexp hooks"""
View
@@ -143,8 +143,8 @@ def load_user_plugin(plugin, *args, **kwargs):
if plugin == user_plugin:
try:
__import__(plugin, globals(), locals(), [plugin])
- except Exception, e:
- LOG.error(e)
+ except Exception, exc:
+ LOG.error(exc)
def load_plugins(*args, **kwargs):
@@ -157,8 +157,8 @@ def load_plugins(*args, **kwargs):
try:
__import__("pyhole.plugins", globals(), locals(), [plugin_name])
- except Exception, e:
- LOG.error(e)
+ except Exception, exc:
+ LOG.error(exc)
_init_plugins(*args, **kwargs)
@@ -189,8 +189,8 @@ def reload_plugins(*args, **kwargs):
for plugin in plugins_to_reload:
try:
reload(sys.modules[plugin])
- except Exception, e:
- LOG.error(e)
+ except Exception, exc:
+ LOG.error(exc)
# Load new plugins
load_plugins(*args, **kwargs)

0 comments on commit f6b90cb

Please sign in to comment.