diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/core/switchboard.py | 5 | ||||
| -rw-r--r-- | src/mailman/email/message.py | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/mailman/core/switchboard.py b/src/mailman/core/switchboard.py index 8f5dcabea..8b971ad33 100644 --- a/src/mailman/core/switchboard.py +++ b/src/mailman/core/switchboard.py @@ -236,8 +236,7 @@ class Switchboard: for filebase in self.get_files('.bak'): src = os.path.join(self.queue_directory, filebase + '.bak') dst = os.path.join(self.queue_directory, filebase + '.pck') - fp = open(src, 'rb+') - try: + with open(src, 'rb+') as fp: try: msg = cPickle.load(fp) data_pos = fp.tell() @@ -265,5 +264,3 @@ class Switchboard: self.finish(filebase, preserve=True) else: os.rename(src, dst) - finally: - fp.close() diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py index 546474fbe..55b439530 100644 --- a/src/mailman/email/message.py +++ b/src/mailman/email/message.py @@ -90,7 +90,7 @@ class Message(email.message.Message): # The pickled instance should have an __version__ string, but it may # not if it's an email package message. version = values.get('__version__', (0, 0, 0)) - values['__version__'] = VERSION + values['__version__'] = version # There's really nothing to check; there's nothing newer than email # 4.0.1 at the moment. |