Skip to content

Commit 2f09d9c

Browse files
author
Ivo Bellin Salarin
committed
fix: report patches in a new context
1 parent 49b1fb4 commit 2f09d9c

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

Lib/mailbox.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,6 +1224,7 @@ def get_sequences(self):
12241224
with f:
12251225
all_keys = set(self.keys())
12261226
for line in f:
1227+
line = line.rstrip()
12271228
try:
12281229
name, contents = line.split(':')
12291230
keys = set()
@@ -1239,7 +1240,7 @@ def get_sequences(self):
12391240
del results[name]
12401241
except ValueError:
12411242
raise FormatError('Invalid sequence specification: %s' %
1242-
line.rstrip())
1243+
line)
12431244
return results
12441245

12451246
def set_sequences(self, sequences):
@@ -1291,7 +1292,7 @@ def pack(self):
12911292
self._next_key = prev + 1
12921293
if len(changes) == 0:
12931294
return
1294-
for name, key_list in sequences.items():
1295+
for key_list in sequences.values():
12951296
for old, new in changes:
12961297
if old in key_list:
12971298
key_list[key_list.index(old)] = new

Lib/test/test_mailbox.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,6 +1377,11 @@ def test_sequences(self):
13771377
msg0 = mailbox.MHMessage(self._template % 0)
13781378
msg0.add_sequence('foo')
13791379
key0 = self._box.add(msg0)
1380+
msg = self._box.get_message(key0)
1381+
self.assertEqual(len(msg.get_sequences()), 1)
1382+
self.assertEqual(msg.get_sequences()[0], 'foo')
1383+
self.assertEqual(msg['from'], 'foo')
1384+
self.assertEqual(msg.get_payload(), '0\n')
13801385
self.assertEqual(self._box.get_sequences(), {'foo':[key0]})
13811386
msg1 = mailbox.MHMessage(self._template % 1)
13821387
msg1.set_sequences(['bar', 'replied', 'foo'])

0 commit comments

Comments
 (0)