14 files changed, 34 insertions, 14 deletions
diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py
index 3e927cc40..eb8787ad2 100644
--- a/src/mailman/core/initialize.py
+++ b/src/mailman/core/initialize.py
@@ -24,7 +24,7 @@ line argument parsing, since some of the initialization behavior is controlled
 by the command line arguments.
 """
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/database/model.py b/src/mailman/database/model.py
index 0ce5d8296..58d5942a4 100644
--- a/src/mailman/database/model.py
+++ b/src/mailman/database/model.py
@@ -17,7 +17,7 @@
 
 """Base class for all database classes."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/database/schema/mm_20120407000000.py b/src/mailman/database/schema/mm_20120407000000.py
index 3e778ea8f..df192b2ae 100644
--- a/src/mailman/database/schema/mm_20120407000000.py
+++ b/src/mailman/database/schema/mm_20120407000000.py
@@ -80,7 +80,7 @@ def upgrade_sqlite(database, store, version, module_path):
         'news_prefix_subject_too, news_moderation, '
         'archive, archive_private FROM mailinglist;')
     for value in results:
-        (id, list_post, 
+        (id, list_post,
          news_prefix, news_moderation,
          archive, archive_private) = value
         # Figure out what the new archive_policy column value should be.
diff --git a/src/mailman/database/sqlite.py b/src/mailman/database/sqlite.py
index a9683457a..8415aa1ee 100644
--- a/src/mailman/database/sqlite.py
+++ b/src/mailman/database/sqlite.py
@@ -17,7 +17,7 @@
 
 """SQLite database support."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/database/tests/data/migration_postgres_1.sql b/src/mailman/database/tests/data/migration_postgres_1.sql
index f144367d0..b82ecf6e4 100644
--- a/src/mailman/database/tests/data/migration_postgres_1.sql
+++ b/src/mailman/database/tests/data/migration_postgres_1.sql
@@ -88,7 +88,7 @@ from: .*@uplinkpro.com
     'Test',E'\\x80025D71012E',
     -- reply_goes_to_list,reply_to_address
     0,'',
-    -- require_explicit_destination,respond_to_post_requests    
+    -- require_explicit_destination,respond_to_post_requests
     True,True,
     -- scrub_nondigest,send_goodbye_message,send_reminders,send_welcome_message
     False,True,True,True,
diff --git a/src/mailman/database/tests/data/migration_sqlite_1.sql b/src/mailman/database/tests/data/migration_sqlite_1.sql
index c8810b130..a5ac96dfa 100644
--- a/src/mailman/database/tests/data/migration_sqlite_1.sql
+++ b/src/mailman/database/tests/data/migration_sqlite_1.sql
@@ -88,7 +88,7 @@ from: .*@uplinkpro.com
     'Test',X'80025D71012E',
     -- reply_goes_to_list,reply_to_address
     0,'',
-    -- require_explicit_destination,respond_to_post_requests    
+    -- require_explicit_destination,respond_to_post_requests
     1,1,
     -- scrub_nondigest,send_goodbye_message,send_reminders,send_welcome_message
     0,1,1,1,
diff --git a/src/mailman/docs/NEWS.rst b/src/mailman/docs/NEWS.rst
index 4a348a691..ea79a3084 100644
--- a/src/mailman/docs/NEWS.rst
+++ b/src/mailman/docs/NEWS.rst
@@ -53,6 +53,21 @@ Architecture
    * `mailman.interfaces.chains.RejectEvent`
  * A `ConfigurationUpdatedEvent` is triggered when the system-wide global
    configuration stack is pushed or popped.
+ * The policy for archiving has now been collapsed into a single enum, called
+   ArchivePolicy.  This describes the three states of never archive, archive
+   privately, and archive_publicly. (LP: #967238)
+
+Database
+--------
+ * Schema migrations (LP: #971013)
+   - include_list_post_header -> allow_list_posts
+   - news_prefix_subject_too  -> nntp_prefix_subject_too
+   - news_moderation          -> newsgroup_moderation
+   - archive and archive_private have been collapsed into archive_policy.
+   - nntp_host has been removed.
+ * The PostgreSQL port of the schema accidentally added a moderation_callback
+   column to the mailinglist table.  Since this is unused in Mailman, it was
+   simply commented out of the base schema for PostgreSQL.
 
 Configuration
 -------------
diff --git a/src/mailman/interfaces/archiver.py b/src/mailman/interfaces/archiver.py
index 1f7e57ef0..d9ca45514 100644
--- a/src/mailman/interfaces/archiver.py
+++ b/src/mailman/interfaces/archiver.py
@@ -17,7 +17,7 @@
 
 """Interface for archiving schemes."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/interfaces/mailinglist.py b/src/mailman/interfaces/mailinglist.py
index 5f7c556b1..c5079bad0 100644
--- a/src/mailman/interfaces/mailinglist.py
+++ b/src/mailman/interfaces/mailinglist.py
@@ -17,7 +17,7 @@
 
 """Interface for a mailing list."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/interfaces/nntp.py b/src/mailman/interfaces/nntp.py
index 61063236c..22b8b1754 100644
--- a/src/mailman/interfaces/nntp.py
+++ b/src/mailman/interfaces/nntp.py
@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
+"""NNTP and newsgroup interfaces."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 __metaclass__ = type
 __all__ = [
     'NewsgroupModeration',
diff --git a/src/mailman/model/version.py b/src/mailman/model/version.py
index bae9322ea..8b4dcae89 100644
--- a/src/mailman/model/version.py
+++ b/src/mailman/model/version.py
@@ -17,7 +17,7 @@
 
 """Model class for version numbers."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/rest/configuration.py b/src/mailman/rest/configuration.py
index 68a85c061..307f415b6 100644
--- a/src/mailman/rest/configuration.py
+++ b/src/mailman/rest/configuration.py
@@ -17,7 +17,7 @@
 
 """Mailing list configuration via REST API."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/testing/testing.cfg b/src/mailman/testing/testing.cfg
index 141d74a8f..0be01298b 100644
--- a/src/mailman/testing/testing.cfg
+++ b/src/mailman/testing/testing.cfg
@@ -18,9 +18,9 @@
 # A testing configuration.
 
 # For testing against PostgreSQL.
-# [database]
-# class: mailman.database.postgresql.PostgreSQLDatabase
-# url: postgres://barry:barry@localhost/mailman
+[database]
+class: mailman.database.postgresql.PostgreSQLDatabase
+url: postgres://barry:barry@localhost/mailman
 
 [mailman]
 site_owner: noreply@example.com
diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py
index 6013649f7..2cc0dafe5 100644
--- a/src/mailman/utilities/tests/test_import.py
+++ b/src/mailman/utilities/tests/test_import.py
@@ -17,10 +17,11 @@
 
 """Tests for config.pck imports."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
+    'TestBasicImport',
     ]