diff options
| author | David Planella <david.planella@gmail.com> | 2009-01-29 00:22:52 +0100 |
|---|---|---|
| committer | David Planella <david.planella@gmail.com> | 2009-01-29 00:22:52 +0100 |
| commit | 518b3843c0117f24b1b277a724169fb616604e4d (patch) | |
| tree | 01ab5cbe392ff3a8e851dae1be4eb3a8cf8ed439 /Mailman/Queue | |
| parent | 42fcf522d7818e9e1ee922d1a68824b0f6dcc83d (diff) | |
| parent | c0da6af58657b1fe5730d3dea0e78bc17dac490a (diff) | |
| download | mailman2-518b3843c0117f24b1b277a724169fb616604e4d.tar.gz mailman2-518b3843c0117f24b1b277a724169fb616604e4d.tar.xz mailman2-518b3843c0117f24b1b277a724169fb616604e4d.zip | |
Merged from upstream
Diffstat (limited to 'Mailman/Queue')
| -rw-r--r-- | Mailman/Queue/Switchboard.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mailman/Queue/Switchboard.py b/Mailman/Queue/Switchboard.py index 94b8efa0..bd1cd357 100644 --- a/Mailman/Queue/Switchboard.py +++ b/Mailman/Queue/Switchboard.py @@ -35,7 +35,6 @@ # needs. import os -import sha import time import email import errno @@ -46,6 +45,7 @@ from Mailman import mm_cfg from Mailman import Utils from Mailman import Message from Mailman.Logging.Syslog import syslog +from Mailman.Utils import sha_new # 20 bytes of all bits set, maximum sha.digest() value shamax = 0xffffffffffffffffffffffffffffffffffffffffL @@ -118,7 +118,7 @@ class Switchboard: # this system) and the sha hex digest. #rcvtime = data.setdefault('received_time', now) rcvtime = data.setdefault('received_time', now) - filebase = `rcvtime` + '+' + sha.new(hashfood).hexdigest() + filebase = `rcvtime` + '+' + sha_new(hashfood).hexdigest() filename = os.path.join(self.__whichq, filebase + '.pck') tmpfile = filename + '.tmp' # Always add the metadata schema version number |