104 files changed, 2 insertions, 2 deletions
diff --git a/src/mailman/bounces/__init__.py b/src/mailman/bouncers/tests/__init__.py
index e69de29bb..e69de29bb 100644
--- a/src/mailman/bounces/__init__.py
+++ b/src/mailman/bouncers/tests/__init__.py
diff --git a/src/mailman/bounces/tests/__init__.py b/src/mailman/bouncers/tests/data/__init__.py
index e69de29bb..e69de29bb 100644
--- a/src/mailman/bounces/tests/__init__.py
+++ b/src/mailman/bouncers/tests/data/__init__.py
diff --git a/src/mailman/bounces/tests/data/aol_01.txt b/src/mailman/bouncers/tests/data/aol_01.txt
index 2abf0975d..2abf0975d 100644
--- a/src/mailman/bounces/tests/data/aol_01.txt
+++ b/src/mailman/bouncers/tests/data/aol_01.txt
diff --git a/src/mailman/bounces/tests/data/bounce_01.txt b/src/mailman/bouncers/tests/data/bounce_01.txt
index ab7f45d47..ab7f45d47 100644
--- a/src/mailman/bounces/tests/data/bounce_01.txt
+++ b/src/mailman/bouncers/tests/data/bounce_01.txt
diff --git a/src/mailman/bounces/tests/data/bounce_02.txt b/src/mailman/bouncers/tests/data/bounce_02.txt
index 0f7d7f32d..0f7d7f32d 100644
--- a/src/mailman/bounces/tests/data/bounce_02.txt
+++ b/src/mailman/bouncers/tests/data/bounce_02.txt
diff --git a/src/mailman/bounces/tests/data/bounce_03.txt b/src/mailman/bouncers/tests/data/bounce_03.txt
index fc62dcab6..fc62dcab6 100644
--- a/src/mailman/bounces/tests/data/bounce_03.txt
+++ b/src/mailman/bouncers/tests/data/bounce_03.txt
diff --git a/src/mailman/bounces/tests/data/dsn_01.txt b/src/mailman/bouncers/tests/data/dsn_01.txt
index d09768c6a..d09768c6a 100644
--- a/src/mailman/bounces/tests/data/dsn_01.txt
+++ b/src/mailman/bouncers/tests/data/dsn_01.txt
diff --git a/src/mailman/bounces/tests/data/dsn_02.txt b/src/mailman/bouncers/tests/data/dsn_02.txt
index 3525605f8..3525605f8 100644
--- a/src/mailman/bounces/tests/data/dsn_02.txt
+++ b/src/mailman/bouncers/tests/data/dsn_02.txt
diff --git a/src/mailman/bounces/tests/data/dsn_03.txt b/src/mailman/bouncers/tests/data/dsn_03.txt
index 4e4fef058..4e4fef058 100644
--- a/src/mailman/bounces/tests/data/dsn_03.txt
+++ b/src/mailman/bouncers/tests/data/dsn_03.txt
diff --git a/src/mailman/bounces/tests/data/dsn_04.txt b/src/mailman/bouncers/tests/data/dsn_04.txt
index 9bea97589..9bea97589 100644
--- a/src/mailman/bounces/tests/data/dsn_04.txt
+++ b/src/mailman/bouncers/tests/data/dsn_04.txt
diff --git a/src/mailman/bounces/tests/data/dsn_05.txt b/src/mailman/bouncers/tests/data/dsn_05.txt
index 73331578e..73331578e 100644
--- a/src/mailman/bounces/tests/data/dsn_05.txt
+++ b/src/mailman/bouncers/tests/data/dsn_05.txt
diff --git a/src/mailman/bounces/tests/data/dsn_06.txt b/src/mailman/bouncers/tests/data/dsn_06.txt
index 22f69760a..22f69760a 100644
--- a/src/mailman/bounces/tests/data/dsn_06.txt
+++ b/src/mailman/bouncers/tests/data/dsn_06.txt
diff --git a/src/mailman/bounces/tests/data/dsn_07.txt b/src/mailman/bouncers/tests/data/dsn_07.txt
index 2e5a0e5d8..2e5a0e5d8 100644
--- a/src/mailman/bounces/tests/data/dsn_07.txt
+++ b/src/mailman/bouncers/tests/data/dsn_07.txt
diff --git a/src/mailman/bounces/tests/data/dsn_08.txt b/src/mailman/bouncers/tests/data/dsn_08.txt
index 8d4d3b8b6..8d4d3b8b6 100644
--- a/src/mailman/bounces/tests/data/dsn_08.txt
+++ b/src/mailman/bouncers/tests/data/dsn_08.txt
diff --git a/src/mailman/bounces/tests/data/dsn_09.txt b/src/mailman/bouncers/tests/data/dsn_09.txt
index 89c0f9add..89c0f9add 100644
--- a/src/mailman/bounces/tests/data/dsn_09.txt
+++ b/src/mailman/bouncers/tests/data/dsn_09.txt
diff --git a/src/mailman/bounces/tests/data/dsn_10.txt b/src/mailman/bouncers/tests/data/dsn_10.txt
index d37aa1745..d37aa1745 100644
--- a/src/mailman/bounces/tests/data/dsn_10.txt
+++ b/src/mailman/bouncers/tests/data/dsn_10.txt
diff --git a/src/mailman/bounces/tests/data/dsn_11.txt b/src/mailman/bouncers/tests/data/dsn_11.txt
index f3e8acaa7..f3e8acaa7 100644
--- a/src/mailman/bounces/tests/data/dsn_11.txt
+++ b/src/mailman/bouncers/tests/data/dsn_11.txt
diff --git a/src/mailman/bounces/tests/data/dsn_12.txt b/src/mailman/bouncers/tests/data/dsn_12.txt
index 473abb8b2..473abb8b2 100644
--- a/src/mailman/bounces/tests/data/dsn_12.txt
+++ b/src/mailman/bouncers/tests/data/dsn_12.txt
diff --git a/src/mailman/bounces/tests/data/dsn_13.txt b/src/mailman/bouncers/tests/data/dsn_13.txt
index c9156f3af..c9156f3af 100644
--- a/src/mailman/bounces/tests/data/dsn_13.txt
+++ b/src/mailman/bouncers/tests/data/dsn_13.txt
diff --git a/src/mailman/bounces/tests/data/dsn_14.txt b/src/mailman/bouncers/tests/data/dsn_14.txt
index 448b4e042..448b4e042 100644
--- a/src/mailman/bounces/tests/data/dsn_14.txt
+++ b/src/mailman/bouncers/tests/data/dsn_14.txt
diff --git a/src/mailman/bounces/tests/data/dsn_15.txt b/src/mailman/bouncers/tests/data/dsn_15.txt
index 1e3c62dec..1e3c62dec 100644
--- a/src/mailman/bounces/tests/data/dsn_15.txt
+++ b/src/mailman/bouncers/tests/data/dsn_15.txt
diff --git a/src/mailman/bounces/tests/data/dsn_16.txt b/src/mailman/bouncers/tests/data/dsn_16.txt
index b1f9b9ec7..b1f9b9ec7 100644
--- a/src/mailman/bounces/tests/data/dsn_16.txt
+++ b/src/mailman/bouncers/tests/data/dsn_16.txt
diff --git a/src/mailman/bounces/tests/data/dsn_17.txt b/src/mailman/bouncers/tests/data/dsn_17.txt
index 2fc60838d..2fc60838d 100644
--- a/src/mailman/bounces/tests/data/dsn_17.txt
+++ b/src/mailman/bouncers/tests/data/dsn_17.txt
diff --git a/src/mailman/bounces/tests/data/dumbass_01.txt b/src/mailman/bouncers/tests/data/dumbass_01.txt
index c4e40d4b0..c4e40d4b0 100644
--- a/src/mailman/bounces/tests/data/dumbass_01.txt
+++ b/src/mailman/bouncers/tests/data/dumbass_01.txt
diff --git a/src/mailman/bounces/tests/data/exim_01.txt b/src/mailman/bouncers/tests/data/exim_01.txt
index 42ceb0b0a..42ceb0b0a 100644
--- a/src/mailman/bounces/tests/data/exim_01.txt
+++ b/src/mailman/bouncers/tests/data/exim_01.txt
diff --git a/src/mailman/bounces/tests/data/groupwise_01.txt b/src/mailman/bouncers/tests/data/groupwise_01.txt
index 68101ba07..68101ba07 100644
--- a/src/mailman/bounces/tests/data/groupwise_01.txt
+++ b/src/mailman/bouncers/tests/data/groupwise_01.txt
diff --git a/src/mailman/bounces/tests/data/groupwise_02.txt b/src/mailman/bouncers/tests/data/groupwise_02.txt
index 3abfdf869..3abfdf869 100644
--- a/src/mailman/bounces/tests/data/groupwise_02.txt
+++ b/src/mailman/bouncers/tests/data/groupwise_02.txt
diff --git a/src/mailman/bounces/tests/data/hotpop_01.txt b/src/mailman/bouncers/tests/data/hotpop_01.txt
index b02f42656..b02f42656 100644
--- a/src/mailman/bounces/tests/data/hotpop_01.txt
+++ b/src/mailman/bouncers/tests/data/hotpop_01.txt
diff --git a/src/mailman/bounces/tests/data/llnl_01.txt b/src/mailman/bouncers/tests/data/llnl_01.txt
index 9a6de7f9a..9a6de7f9a 100644
--- a/src/mailman/bounces/tests/data/llnl_01.txt
+++ b/src/mailman/bouncers/tests/data/llnl_01.txt
diff --git a/src/mailman/bounces/tests/data/microsoft_01.txt b/src/mailman/bouncers/tests/data/microsoft_01.txt
index 92465f78b..92465f78b 100644
--- a/src/mailman/bounces/tests/data/microsoft_01.txt
+++ b/src/mailman/bouncers/tests/data/microsoft_01.txt
diff --git a/src/mailman/bounces/tests/data/microsoft_02.txt b/src/mailman/bouncers/tests/data/microsoft_02.txt
index 3c6c5416d..3c6c5416d 100644
--- a/src/mailman/bounces/tests/data/microsoft_02.txt
+++ b/src/mailman/bouncers/tests/data/microsoft_02.txt
diff --git a/src/mailman/bounces/tests/data/microsoft_03.txt b/src/mailman/bouncers/tests/data/microsoft_03.txt
index e4216e0c9..e4216e0c9 100644
--- a/src/mailman/bounces/tests/data/microsoft_03.txt
+++ b/src/mailman/bouncers/tests/data/microsoft_03.txt
diff --git a/src/mailman/bounces/tests/data/netscape_01.txt b/src/mailman/bouncers/tests/data/netscape_01.txt
index adcde15b9..adcde15b9 100644
--- a/src/mailman/bounces/tests/data/netscape_01.txt
+++ b/src/mailman/bouncers/tests/data/netscape_01.txt
diff --git a/src/mailman/bounces/tests/data/newmailru_01.txt b/src/mailman/bouncers/tests/data/newmailru_01.txt
index 7802c1516..7802c1516 100644
--- a/src/mailman/bounces/tests/data/newmailru_01.txt
+++ b/src/mailman/bouncers/tests/data/newmailru_01.txt
diff --git a/src/mailman/bounces/tests/data/postfix_01.txt b/src/mailman/bouncers/tests/data/postfix_01.txt
index 186cc7633..186cc7633 100644
--- a/src/mailman/bounces/tests/data/postfix_01.txt
+++ b/src/mailman/bouncers/tests/data/postfix_01.txt
diff --git a/src/mailman/bounces/tests/data/postfix_02.txt b/src/mailman/bouncers/tests/data/postfix_02.txt
index c4065816e..c4065816e 100644
--- a/src/mailman/bounces/tests/data/postfix_02.txt
+++ b/src/mailman/bouncers/tests/data/postfix_02.txt
diff --git a/src/mailman/bounces/tests/data/postfix_03.txt b/src/mailman/bouncers/tests/data/postfix_03.txt
index 5204712c4..5204712c4 100644
--- a/src/mailman/bounces/tests/data/postfix_03.txt
+++ b/src/mailman/bouncers/tests/data/postfix_03.txt
diff --git a/src/mailman/bounces/tests/data/postfix_04.txt b/src/mailman/bouncers/tests/data/postfix_04.txt
index 86a60ea8d..86a60ea8d 100644
--- a/src/mailman/bounces/tests/data/postfix_04.txt
+++ b/src/mailman/bouncers/tests/data/postfix_04.txt
diff --git a/src/mailman/bounces/tests/data/postfix_05.txt b/src/mailman/bouncers/tests/data/postfix_05.txt
index 4bd56d60a..4bd56d60a 100644
--- a/src/mailman/bounces/tests/data/postfix_05.txt
+++ b/src/mailman/bouncers/tests/data/postfix_05.txt
diff --git a/src/mailman/bounces/tests/data/qmail_01.txt b/src/mailman/bouncers/tests/data/qmail_01.txt
index dbe6f4351..dbe6f4351 100644
--- a/src/mailman/bounces/tests/data/qmail_01.txt
+++ b/src/mailman/bouncers/tests/data/qmail_01.txt
diff --git a/src/mailman/bounces/tests/data/qmail_02.txt b/src/mailman/bouncers/tests/data/qmail_02.txt
index ad3a232f1..ad3a232f1 100644
--- a/src/mailman/bounces/tests/data/qmail_02.txt
+++ b/src/mailman/bouncers/tests/data/qmail_02.txt
diff --git a/src/mailman/bounces/tests/data/qmail_03.txt b/src/mailman/bouncers/tests/data/qmail_03.txt
index 04e352806..04e352806 100644
--- a/src/mailman/bounces/tests/data/qmail_03.txt
+++ b/src/mailman/bouncers/tests/data/qmail_03.txt
diff --git a/src/mailman/bounces/tests/data/qmail_04.txt b/src/mailman/bouncers/tests/data/qmail_04.txt
index 035d74d6d..035d74d6d 100644
--- a/src/mailman/bounces/tests/data/qmail_04.txt
+++ b/src/mailman/bouncers/tests/data/qmail_04.txt
diff --git a/src/mailman/bounces/tests/data/qmail_05.txt b/src/mailman/bouncers/tests/data/qmail_05.txt
index 843620257..843620257 100644
--- a/src/mailman/bounces/tests/data/qmail_05.txt
+++ b/src/mailman/bouncers/tests/data/qmail_05.txt
diff --git a/src/mailman/bounces/tests/data/qmail_06.txt b/src/mailman/bouncers/tests/data/qmail_06.txt
index 1a466d5a5..1a466d5a5 100644
--- a/src/mailman/bounces/tests/data/qmail_06.txt
+++ b/src/mailman/bouncers/tests/data/qmail_06.txt
diff --git a/src/mailman/bounces/tests/data/sendmail_01.txt b/src/mailman/bouncers/tests/data/sendmail_01.txt
index cfea95a2f..cfea95a2f 100644
--- a/src/mailman/bounces/tests/data/sendmail_01.txt
+++ b/src/mailman/bouncers/tests/data/sendmail_01.txt
diff --git a/src/mailman/bounces/tests/data/simple_01.txt b/src/mailman/bouncers/tests/data/simple_01.txt
index f2d2669f6..f2d2669f6 100644
--- a/src/mailman/bounces/tests/data/simple_01.txt
+++ b/src/mailman/bouncers/tests/data/simple_01.txt
diff --git a/src/mailman/bounces/tests/data/simple_02.txt b/src/mailman/bouncers/tests/data/simple_02.txt
index f017fa25d..f017fa25d 100644
--- a/src/mailman/bounces/tests/data/simple_02.txt
+++ b/src/mailman/bouncers/tests/data/simple_02.txt
diff --git a/src/mailman/bounces/tests/data/simple_03.txt b/src/mailman/bouncers/tests/data/simple_03.txt
index 16fc04d63..16fc04d63 100644
--- a/src/mailman/bounces/tests/data/simple_03.txt
+++ b/src/mailman/bouncers/tests/data/simple_03.txt
diff --git a/src/mailman/bounces/tests/data/simple_04.txt b/src/mailman/bouncers/tests/data/simple_04.txt
index 022a31980..022a31980 100644
--- a/src/mailman/bounces/tests/data/simple_04.txt
+++ b/src/mailman/bouncers/tests/data/simple_04.txt
diff --git a/src/mailman/bounces/tests/data/simple_05.txt b/src/mailman/bouncers/tests/data/simple_05.txt
index c67113b40..c67113b40 100644
--- a/src/mailman/bounces/tests/data/simple_05.txt
+++ b/src/mailman/bouncers/tests/data/simple_05.txt
diff --git a/src/mailman/bounces/tests/data/simple_06.txt b/src/mailman/bouncers/tests/data/simple_06.txt
index bbb2b7573..bbb2b7573 100644
--- a/src/mailman/bounces/tests/data/simple_06.txt
+++ b/src/mailman/bouncers/tests/data/simple_06.txt
diff --git a/src/mailman/bounces/tests/data/simple_07.txt b/src/mailman/bouncers/tests/data/simple_07.txt
index 46930ec4a..46930ec4a 100644
--- a/src/mailman/bounces/tests/data/simple_07.txt
+++ b/src/mailman/bouncers/tests/data/simple_07.txt
diff --git a/src/mailman/bounces/tests/data/simple_08.txt b/src/mailman/bouncers/tests/data/simple_08.txt
index c2067ce53..c2067ce53 100644
--- a/src/mailman/bounces/tests/data/simple_08.txt
+++ b/src/mailman/bouncers/tests/data/simple_08.txt
diff --git a/src/mailman/bounces/tests/data/simple_09.txt b/src/mailman/bouncers/tests/data/simple_09.txt
index 340c410b7..340c410b7 100644
--- a/src/mailman/bounces/tests/data/simple_09.txt
+++ b/src/mailman/bouncers/tests/data/simple_09.txt
diff --git a/src/mailman/bounces/tests/data/simple_10.txt b/src/mailman/bouncers/tests/data/simple_10.txt
index dfc9c3cf0..dfc9c3cf0 100644
--- a/src/mailman/bounces/tests/data/simple_10.txt
+++ b/src/mailman/bouncers/tests/data/simple_10.txt
diff --git a/src/mailman/bounces/tests/data/simple_11.txt b/src/mailman/bouncers/tests/data/simple_11.txt
index 2d046db5c..2d046db5c 100644
--- a/src/mailman/bounces/tests/data/simple_11.txt
+++ b/src/mailman/bouncers/tests/data/simple_11.txt
diff --git a/src/mailman/bounces/tests/data/simple_12.txt b/src/mailman/bouncers/tests/data/simple_12.txt
index b2146d46d..b2146d46d 100644
--- a/src/mailman/bounces/tests/data/simple_12.txt
+++ b/src/mailman/bouncers/tests/data/simple_12.txt
diff --git a/src/mailman/bounces/tests/data/simple_13.txt b/src/mailman/bouncers/tests/data/simple_13.txt
index 1cbe0f955..1cbe0f955 100644
--- a/src/mailman/bounces/tests/data/simple_13.txt
+++ b/src/mailman/bouncers/tests/data/simple_13.txt
diff --git a/src/mailman/bounces/tests/data/simple_14.txt b/src/mailman/bouncers/tests/data/simple_14.txt
index caffd77b7..caffd77b7 100644
--- a/src/mailman/bounces/tests/data/simple_14.txt
+++ b/src/mailman/bouncers/tests/data/simple_14.txt
diff --git a/src/mailman/bounces/tests/data/simple_15.txt b/src/mailman/bouncers/tests/data/simple_15.txt
index 522096a72..522096a72 100644
--- a/src/mailman/bounces/tests/data/simple_15.txt
+++ b/src/mailman/bouncers/tests/data/simple_15.txt
diff --git a/src/mailman/bounces/tests/data/simple_16.txt b/src/mailman/bouncers/tests/data/simple_16.txt
index 4ab1f1bee..4ab1f1bee 100644
--- a/src/mailman/bounces/tests/data/simple_16.txt
+++ b/src/mailman/bouncers/tests/data/simple_16.txt
diff --git a/src/mailman/bounces/tests/data/simple_17.txt b/src/mailman/bouncers/tests/data/simple_17.txt
index 4d4cbfa80..4d4cbfa80 100644
--- a/src/mailman/bounces/tests/data/simple_17.txt
+++ b/src/mailman/bouncers/tests/data/simple_17.txt
diff --git a/src/mailman/bounces/tests/data/simple_18.txt b/src/mailman/bouncers/tests/data/simple_18.txt
index 6f642a463..6f642a463 100644
--- a/src/mailman/bounces/tests/data/simple_18.txt
+++ b/src/mailman/bouncers/tests/data/simple_18.txt
diff --git a/src/mailman/bounces/tests/data/simple_19.txt b/src/mailman/bouncers/tests/data/simple_19.txt
index 54ea96c9a..54ea96c9a 100644
--- a/src/mailman/bounces/tests/data/simple_19.txt
+++ b/src/mailman/bouncers/tests/data/simple_19.txt
diff --git a/src/mailman/bounces/tests/data/simple_20.txt b/src/mailman/bouncers/tests/data/simple_20.txt
index 84991148b..84991148b 100644
--- a/src/mailman/bounces/tests/data/simple_20.txt
+++ b/src/mailman/bouncers/tests/data/simple_20.txt
diff --git a/src/mailman/bounces/tests/data/simple_21.txt b/src/mailman/bouncers/tests/data/simple_21.txt
index dde9c4445..dde9c4445 100644
--- a/src/mailman/bounces/tests/data/simple_21.txt
+++ b/src/mailman/bouncers/tests/data/simple_21.txt
diff --git a/src/mailman/bounces/tests/data/simple_22.txt b/src/mailman/bouncers/tests/data/simple_22.txt
index 99b0cc5ba..99b0cc5ba 100644
--- a/src/mailman/bounces/tests/data/simple_22.txt
+++ b/src/mailman/bouncers/tests/data/simple_22.txt
diff --git a/src/mailman/bounces/tests/data/simple_23.txt b/src/mailman/bouncers/tests/data/simple_23.txt
index 7399315a8..7399315a8 100644
--- a/src/mailman/bounces/tests/data/simple_23.txt
+++ b/src/mailman/bouncers/tests/data/simple_23.txt
diff --git a/src/mailman/bounces/tests/data/simple_24.txt b/src/mailman/bouncers/tests/data/simple_24.txt
index 447a2201e..447a2201e 100644
--- a/src/mailman/bounces/tests/data/simple_24.txt
+++ b/src/mailman/bouncers/tests/data/simple_24.txt
diff --git a/src/mailman/bounces/tests/data/simple_25.txt b/src/mailman/bouncers/tests/data/simple_25.txt
index 1973ca3aa..1973ca3aa 100644
--- a/src/mailman/bounces/tests/data/simple_25.txt
+++ b/src/mailman/bouncers/tests/data/simple_25.txt
diff --git a/src/mailman/bounces/tests/data/simple_26.txt b/src/mailman/bouncers/tests/data/simple_26.txt
index 4c8689461..4c8689461 100644
--- a/src/mailman/bounces/tests/data/simple_26.txt
+++ b/src/mailman/bouncers/tests/data/simple_26.txt
diff --git a/src/mailman/bounces/tests/data/simple_27.txt b/src/mailman/bouncers/tests/data/simple_27.txt
index ad1abf2cb..ad1abf2cb 100644
--- a/src/mailman/bounces/tests/data/simple_27.txt
+++ b/src/mailman/bouncers/tests/data/simple_27.txt
diff --git a/src/mailman/bounces/tests/data/simple_28.txt b/src/mailman/bouncers/tests/data/simple_28.txt
index 9af9f5f35..9af9f5f35 100644
--- a/src/mailman/bounces/tests/data/simple_28.txt
+++ b/src/mailman/bouncers/tests/data/simple_28.txt
diff --git a/src/mailman/bounces/tests/data/simple_29.txt b/src/mailman/bouncers/tests/data/simple_29.txt
index 33dcb3c0b..33dcb3c0b 100644
--- a/src/mailman/bounces/tests/data/simple_29.txt
+++ b/src/mailman/bouncers/tests/data/simple_29.txt
diff --git a/src/mailman/bounces/tests/data/simple_30.txt b/src/mailman/bouncers/tests/data/simple_30.txt
index 3f4293d7d..3f4293d7d 100644
--- a/src/mailman/bounces/tests/data/simple_30.txt
+++ b/src/mailman/bouncers/tests/data/simple_30.txt
diff --git a/src/mailman/bounces/tests/data/simple_31.txt b/src/mailman/bouncers/tests/data/simple_31.txt
index 94b229da8..94b229da8 100644
--- a/src/mailman/bounces/tests/data/simple_31.txt
+++ b/src/mailman/bouncers/tests/data/simple_31.txt
diff --git a/src/mailman/bounces/tests/data/simple_32.txt b/src/mailman/bouncers/tests/data/simple_32.txt
index be040178b..be040178b 100644
--- a/src/mailman/bounces/tests/data/simple_32.txt
+++ b/src/mailman/bouncers/tests/data/simple_32.txt
diff --git a/src/mailman/bounces/tests/data/simple_33.txt b/src/mailman/bouncers/tests/data/simple_33.txt
index 291cbe61f..291cbe61f 100644
--- a/src/mailman/bounces/tests/data/simple_33.txt
+++ b/src/mailman/bouncers/tests/data/simple_33.txt
diff --git a/src/mailman/bounces/tests/data/simple_34.txt b/src/mailman/bouncers/tests/data/simple_34.txt
index 0c0b10c68..0c0b10c68 100644
--- a/src/mailman/bounces/tests/data/simple_34.txt
+++ b/src/mailman/bouncers/tests/data/simple_34.txt
diff --git a/src/mailman/bounces/tests/data/simple_35.txt b/src/mailman/bouncers/tests/data/simple_35.txt
index ee43aa3ef..ee43aa3ef 100644
--- a/src/mailman/bounces/tests/data/simple_35.txt
+++ b/src/mailman/bouncers/tests/data/simple_35.txt
diff --git a/src/mailman/bounces/tests/data/simple_36.txt b/src/mailman/bouncers/tests/data/simple_36.txt
index 68d47cbaf..68d47cbaf 100644
--- a/src/mailman/bounces/tests/data/simple_36.txt
+++ b/src/mailman/bouncers/tests/data/simple_36.txt
diff --git a/src/mailman/bounces/tests/data/simple_37.txt b/src/mailman/bouncers/tests/data/simple_37.txt
index 50cb0b289..50cb0b289 100644
--- a/src/mailman/bounces/tests/data/simple_37.txt
+++ b/src/mailman/bouncers/tests/data/simple_37.txt
diff --git a/src/mailman/bounces/tests/data/sina_01.txt b/src/mailman/bouncers/tests/data/sina_01.txt
index 366500a94..366500a94 100644
--- a/src/mailman/bounces/tests/data/sina_01.txt
+++ b/src/mailman/bouncers/tests/data/sina_01.txt
diff --git a/src/mailman/bounces/tests/data/smtp32_01.txt b/src/mailman/bouncers/tests/data/smtp32_01.txt
index decf0ddcc..decf0ddcc 100644
--- a/src/mailman/bounces/tests/data/smtp32_01.txt
+++ b/src/mailman/bouncers/tests/data/smtp32_01.txt
diff --git a/src/mailman/bounces/tests/data/smtp32_02.txt b/src/mailman/bouncers/tests/data/smtp32_02.txt
index 3336a28d4..3336a28d4 100644
--- a/src/mailman/bounces/tests/data/smtp32_02.txt
+++ b/src/mailman/bouncers/tests/data/smtp32_02.txt
diff --git a/src/mailman/bounces/tests/data/smtp32_03.txt b/src/mailman/bouncers/tests/data/smtp32_03.txt
index 0c284afcb..0c284afcb 100644
--- a/src/mailman/bounces/tests/data/smtp32_03.txt
+++ b/src/mailman/bouncers/tests/data/smtp32_03.txt
diff --git a/src/mailman/bounces/tests/data/smtp32_04.txt b/src/mailman/bouncers/tests/data/smtp32_04.txt
index 813d956a0..813d956a0 100644
--- a/src/mailman/bounces/tests/data/smtp32_04.txt
+++ b/src/mailman/bouncers/tests/data/smtp32_04.txt
diff --git a/src/mailman/bounces/tests/data/smtp32_05.txt b/src/mailman/bouncers/tests/data/smtp32_05.txt
index 92997ace2..92997ace2 100644
--- a/src/mailman/bounces/tests/data/smtp32_05.txt
+++ b/src/mailman/bouncers/tests/data/smtp32_05.txt
diff --git a/src/mailman/bounces/tests/data/smtp32_06.txt b/src/mailman/bouncers/tests/data/smtp32_06.txt
index ec7cc9522..ec7cc9522 100644
--- a/src/mailman/bounces/tests/data/smtp32_06.txt
+++ b/src/mailman/bouncers/tests/data/smtp32_06.txt
diff --git a/src/mailman/bounces/tests/data/smtp32_07.txt b/src/mailman/bouncers/tests/data/smtp32_07.txt
index 08167373b..08167373b 100644
--- a/src/mailman/bounces/tests/data/smtp32_07.txt
+++ b/src/mailman/bouncers/tests/data/smtp32_07.txt
diff --git a/src/mailman/bounces/tests/data/yahoo_01.txt b/src/mailman/bouncers/tests/data/yahoo_01.txt
index 0758957f3..0758957f3 100644
--- a/src/mailman/bounces/tests/data/yahoo_01.txt
+++ b/src/mailman/bouncers/tests/data/yahoo_01.txt
diff --git a/src/mailman/bounces/tests/data/yahoo_02.txt b/src/mailman/bouncers/tests/data/yahoo_02.txt
index 90d835dc9..90d835dc9 100644
--- a/src/mailman/bounces/tests/data/yahoo_02.txt
+++ b/src/mailman/bouncers/tests/data/yahoo_02.txt
diff --git a/src/mailman/bounces/tests/data/yahoo_03.txt b/src/mailman/bouncers/tests/data/yahoo_03.txt
index 9de32a43b..9de32a43b 100644
--- a/src/mailman/bounces/tests/data/yahoo_03.txt
+++ b/src/mailman/bouncers/tests/data/yahoo_03.txt
diff --git a/src/mailman/bounces/tests/data/yahoo_04.txt b/src/mailman/bouncers/tests/data/yahoo_04.txt
index cf6036360..cf6036360 100644
--- a/src/mailman/bounces/tests/data/yahoo_04.txt
+++ b/src/mailman/bouncers/tests/data/yahoo_04.txt
diff --git a/src/mailman/bounces/tests/data/yahoo_05.txt b/src/mailman/bouncers/tests/data/yahoo_05.txt
index 56d1a3018..56d1a3018 100644
--- a/src/mailman/bounces/tests/data/yahoo_05.txt
+++ b/src/mailman/bouncers/tests/data/yahoo_05.txt
diff --git a/src/mailman/bounces/tests/data/yahoo_06.txt b/src/mailman/bouncers/tests/data/yahoo_06.txt
index 16c04fd65..16c04fd65 100644
--- a/src/mailman/bounces/tests/data/yahoo_06.txt
+++ b/src/mailman/bouncers/tests/data/yahoo_06.txt
diff --git a/src/mailman/bounces/tests/data/yahoo_07.txt b/src/mailman/bouncers/tests/data/yahoo_07.txt
index 1f35e70f0..1f35e70f0 100644
--- a/src/mailman/bounces/tests/data/yahoo_07.txt
+++ b/src/mailman/bouncers/tests/data/yahoo_07.txt
diff --git a/src/mailman/bounces/tests/data/yahoo_08.txt b/src/mailman/bouncers/tests/data/yahoo_08.txt
index c531cef9b..c531cef9b 100644
--- a/src/mailman/bounces/tests/data/yahoo_08.txt
+++ b/src/mailman/bouncers/tests/data/yahoo_08.txt
diff --git a/src/mailman/bounces/tests/data/yahoo_09.txt b/src/mailman/bouncers/tests/data/yahoo_09.txt
index f8067a5b4..f8067a5b4 100644
--- a/src/mailman/bounces/tests/data/yahoo_09.txt
+++ b/src/mailman/bouncers/tests/data/yahoo_09.txt
diff --git a/src/mailman/bounces/tests/data/yahoo_10.txt b/src/mailman/bouncers/tests/data/yahoo_10.txt
index 958b90924..958b90924 100644
--- a/src/mailman/bounces/tests/data/yahoo_10.txt
+++ b/src/mailman/bouncers/tests/data/yahoo_10.txt
diff --git a/src/mailman/bounces/tests/data/yale_01.txt b/src/mailman/bouncers/tests/data/yale_01.txt
index 7be4754eb..7be4754eb 100644
--- a/src/mailman/bounces/tests/data/yale_01.txt
+++ b/src/mailman/bouncers/tests/data/yale_01.txt
diff --git a/src/mailman/bounces/tests/test_bounces.py b/src/mailman/bouncers/tests/test_bounces.py
index b04d09bf3..7e62dcc22 100644
--- a/src/mailman/bounces/tests/test_bounces.py
+++ b/src/mailman/bouncers/tests/test_bounces.py
@@ -58,7 +58,7 @@ class BounceTestCase(unittest.TestCase):
         module_name = 'mailman.bouncers.' + self.bounce_module
         __import__(module_name)
         self.module = sys.modules[module_name]
-        with closing(resource_stream('mailman.bounces.tests.data',
+        with closing(resource_stream('mailman.bouncers.tests.data',
                                      self.sample_file)) as fp:
             self.message = message_from_file(fp)
 
@@ -96,7 +96,7 @@ def make_test_cases():
 class OtherBounceTests(unittest.TestCase):
     def test_SMTP32_failure(self):
         # This file has no X-Mailer: header
-        with closing(resource_stream('mailman.bounces.tests.data',
+        with closing(resource_stream('mailman.bouncers.tests.data',
                                      'postfix_01.txt')) as fp:
             msg = message_from_file(fp)
         self.failIf(msg['x-mailer'] is not None)
diff --git a/src/mailman/bounces/tests/data/__init__.py b/src/mailman/bounces/tests/data/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/src/mailman/bounces/tests/data/__init__.py
+++ /dev/null