6 files changed, 17 insertions, 16 deletions

diff --git a/src/mailman/database/schema/mm_20121015000000.py b/src/mailman/database/schema/mm_20121015000000.py
index 1ef368bfc..dd6d23ca7 100644
--- a/src/mailman/database/schema/mm_20121015000000.py
+++ b/src/mailman/database/schema/mm_20121015000000.py
@@ -94,5 +94,9 @@ def upgrade_postgres(database, store, version, module_path):
     store.execute('ALTER TABLE ban DROP COLUMN mailing_list;')
     store.execute('ALTER TABLE mailinglist DROP COLUMN new_member_options;')
     store.execute('ALTER TABLE mailinglist DROP COLUMN send_reminders;')
+    store.execute('ALTER TABLE mailinglist DROP COLUMN subscribe_policy;')
+    store.execute('ALTER TABLE mailinglist DROP COLUMN unsubscribe_policy;')
+    store.execute(
+        'ALTER TABLE mailinglist DROP COLUMN subscribe_auto_approval;')
     # Record the migration in the version table.
     database.load_schema(store, version, None, module_path)
diff --git a/src/mailman/database/schema/sqlite_20121015000000_01.sql b/src/mailman/database/schema/sqlite_20121015000000_01.sql
index 5b3a00e0f..73a56230b 100644
--- a/src/mailman/database/schema/sqlite_20121015000000_01.sql
+++ b/src/mailman/database/schema/sqlite_20121015000000_01.sql
@@ -116,12 +116,9 @@ CREATE TABLE ml_backup (
     send_goodbye_message BOOLEAN,
     send_welcome_message BOOLEAN,
     subject_prefix TEXT,
-    subscribe_auto_approval BLOB,
-    subscribe_policy INTEGER,
     topics BLOB,
     topics_bodylines_limit INTEGER,
     topics_enabled BOOLEAN,
-    unsubscribe_policy INTEGER,
     welcome_message_uri TEXT,
     archive_policy INTEGER,
     list_id TEXT,
@@ -221,12 +218,9 @@ INSERT INTO ml_backup SELECT
     send_goodbye_message,
     send_welcome_message,
     subject_prefix,
-    subscribe_auto_approval,
-    subscribe_policy,
     topics,
     topics_bodylines_limit,
     topics_enabled,
-    unsubscribe_policy,
     welcome_message_uri,
     archive_policy,
     list_id,
diff --git a/src/mailman/database/tests/test_migrations.py b/src/mailman/database/tests/test_migrations.py
index d8a210a67..5b800caf7 100644
--- a/src/mailman/database/tests/test_migrations.py
+++ b/src/mailman/database/tests/test_migrations.py
@@ -378,7 +378,9 @@ class TestMigration20121015Schema(MigrationTestBase):
         self._missing_present('mailinglist',
                               ['20121014999999'],
                               (),
-                              ('new_member_options', 'send_reminders'),
+                              ('new_member_options', 'send_reminders',
+                               'subscribe_policy', 'unsubscribe_policy',
+                               'subscribe_auto_approval'),
                               )
 
     def test_post_upgrade_column_migrations(self):
@@ -390,7 +392,9 @@ class TestMigration20121015Schema(MigrationTestBase):
         self._missing_present('mailinglist',
                               ['20121014999999',
                                '20121015000000'],
-                              ('new_member_options', 'send_reminders'),
+                              ('new_member_options', 'send_reminders',
+                               'subscribe_policy', 'unsubscribe_policy',
+                               'subscribe_auto_approval'),
                               ())
 
 
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst
index d4ad867cb..99e4deb41 100644
--- a/src/mailman/docs/NEWS.rst
+++ b/src/mailman/docs/NEWS.rst
@@ -73,8 +73,13 @@ Database
 --------
  * The `ban` table now uses list-ids to cross-reference the mailing list,
    since these cannot change even if the mailing list is moved or renamed.
- * The columns `mailinglist.new_member_options` and
-   `mailinglist.send_reminders` were unused, and have been removed.
+ * The following columns were unused and have been removed:
+
+   - `mailinglist.new_member_options`
+   - `mailinglist.send_reminders`
+   - `mailinglist.subscribe_policy`
+   - `mailinglist.unsubscribe_policy`
+   - `mailinglist.subscribe_auto_approval`
 
 Interfaces
 ----------
diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py
index ae4918a95..b3f0d28cc 100644
--- a/src/mailman/model/mailinglist.py
+++ b/src/mailman/model/mailinglist.py
@@ -185,12 +185,9 @@ class MailingList(Model):
     send_goodbye_message = Bool()
     send_welcome_message = Bool()
     subject_prefix = Unicode()
-    subscribe_auto_approval = Pickle()
-    subscribe_policy = Int()
     topics = Pickle()
     topics_bodylines_limit = Int()
     topics_enabled = Bool()
-    unsubscribe_policy = Int()
     welcome_message_uri = Unicode()
 
     def __init__(self, fqdn_listname):
diff --git a/src/mailman/styles/default.py b/src/mailman/styles/default.py
index f8e94911e..da081f6b0 100644
--- a/src/mailman/styles/default.py
+++ b/src/mailman/styles/default.py
@@ -84,9 +84,6 @@ from: .*@uplinkpro.com
         mlist.info = ''
         mlist.welcome_message_uri = 'mailman:///welcome.txt'
         mlist.goodbye_message_uri = ''
-        mlist.subscribe_policy = 1
-        mlist.subscribe_auto_approval = []
-        mlist.unsubscribe_policy = 0
         mlist.private_roster = 1
         mlist.obscure_addresses = True
         mlist.admin_member_chunksize = 30