summaryrefslogtreecommitdiff
path: root/src/mailman/bin
diff options
context:
space:
mode:
Diffstat (limited to 'src/mailman/bin')
-rw-r--r--src/mailman/bin/bumpdigests.py2
-rw-r--r--src/mailman/bin/master.py6
-rw-r--r--src/mailman/bin/qrunner.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mailman/bin/bumpdigests.py b/src/mailman/bin/bumpdigests.py
index c462fc9f8..d90dbc576 100644
--- a/src/mailman/bin/bumpdigests.py
+++ b/src/mailman/bin/bumpdigests.py
@@ -58,7 +58,7 @@ def main():
try:
# Be sure the list is locked
mlist = MailList.MailList(listname)
- except errors.MMListError, e:
+ except errors.MMListError:
parser.print_help()
print >> sys.stderr, _('No such list: $listname')
sys.exit(1)
diff --git a/src/mailman/bin/master.py b/src/mailman/bin/master.py
index 96b265864..0d0276fdb 100644
--- a/src/mailman/bin/master.py
+++ b/src/mailman/bin/master.py
@@ -27,13 +27,12 @@ __all__ = [
import os
import sys
-import time
import errno
import signal
import socket
import logging
-from datetime import datetime, timedelta
+from datetime import timedelta
from flufl.enum import Enum
from lazr.config import as_boolean
from locknix import lockfile
@@ -119,7 +118,8 @@ def get_lock_data():
with open(config.LOCK_FILE) as fp:
filename = os.path.split(fp.read().strip())[1]
parts = filename.split('.')
- timestamp = parts.pop()
+ # Ignore the timestamp.
+ parts.pop()
pid = parts.pop()
hostname = parts.pop()
filename = DOT.join(reversed(parts))
diff --git a/src/mailman/bin/qrunner.py b/src/mailman/bin/qrunner.py
index 67d2d9abb..cca8b1dae 100644
--- a/src/mailman/bin/qrunner.py
+++ b/src/mailman/bin/qrunner.py
@@ -148,7 +148,7 @@ def make_qrunner(name, slice, range, once=False):
class_path = name
try:
qrclass = find_name(class_path)
- except ImportError as error:
+ except ImportError:
if os.environ.get('MAILMAN_UNDER_MASTER_CONTROL') is not None:
# Exit with SIGTERM exit code so the master watcher won't try to
# restart us.