Use print functions consistently through, and update all __future__ imports to

reflect this.

Also, mock out sys.stderr on some tests so that their nose2 output is quieter.

A few other minor coding style consistencies.

10 files changed, 26 insertions, 15 deletions

diff --git a/src/mailman/utilities/datetime.py b/src/mailman/utilities/datetime.py
index 37317d3f1..b494e2513 100644
--- a/src/mailman/utilities/datetime.py
+++ b/src/mailman/utilities/datetime.py
@@ -23,7 +23,7 @@ instrumented for testing purposes.
 """
 
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/utilities/email.py b/src/mailman/utilities/email.py
index c86ce0913..7025ddb89 100644
--- a/src/mailman/utilities/email.py
+++ b/src/mailman/utilities/email.py
@@ -17,7 +17,7 @@
 
 """Email helpers."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/utilities/filesystem.py b/src/mailman/utilities/filesystem.py
index ed215a6bd..f2a5b705b 100644
--- a/src/mailman/utilities/filesystem.py
+++ b/src/mailman/utilities/filesystem.py
@@ -17,7 +17,7 @@
 
 """Filesystem utilities."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/utilities/interact.py b/src/mailman/utilities/interact.py
index 9aa0e2491..8bca9ee40 100644
--- a/src/mailman/utilities/interact.py
+++ b/src/mailman/utilities/interact.py
@@ -17,7 +17,7 @@
 
 """Provide an interactive prompt, mimicking the Python interpreter."""
 
-from __future__ import unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/utilities/mailbox.py b/src/mailman/utilities/mailbox.py
index 306ac389c..4f085e127 100644
--- a/src/mailman/utilities/mailbox.py
+++ b/src/mailman/utilities/mailbox.py
@@ -17,7 +17,7 @@
 
 """Module stuff."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/utilities/modules.py b/src/mailman/utilities/modules.py
index 414af23ca..5dfec95db 100644
--- a/src/mailman/utilities/modules.py
+++ b/src/mailman/utilities/modules.py
@@ -17,7 +17,7 @@
 
 """Package and module utilities."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/utilities/string.py b/src/mailman/utilities/string.py
index 9f7a1dda9..0ed7cdf95 100644
--- a/src/mailman/utilities/string.py
+++ b/src/mailman/utilities/string.py
@@ -17,7 +17,7 @@
 
 """String utilities."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py
index 220310bd9..308fa8af2 100644
--- a/src/mailman/utilities/tests/test_import.py
+++ b/src/mailman/utilities/tests/test_import.py
@@ -26,8 +26,9 @@ __all__ = [
     ]
 
 
-import cPickle
 import os
+import mock
+import cPickle
 import unittest
 
 from datetime import timedelta, datetime
@@ -107,7 +108,9 @@ class TestBasicImport(unittest.TestCase):
         for rname in ('members', 'digest_members'):
             roster = getattr(self._mlist, rname)
             self.assertFalse(isinstance(roster, dict))
-            self._import()
+            # Suppress warning messages in test output.
+            with mock.patch('sys.stderr'):
+                self._import()
             self.assertFalse(
                 isinstance(roster, dict),
                 'The %s roster has been overwritten by the import' % rname)
@@ -256,7 +259,9 @@ class TestBasicImport(unittest.TestCase):
                          'Encoding to UTF-8 is not handled')
         # Test fallback to ascii with replace.
         self._pckdict[b'info'] = info.encode('iso-8859-1')
-        self._import()
+        # Suppress warning messages in test output.
+        with mock.patch('sys.stderr'):
+            self._import()
         self.assertEqual(self._mlist.info,
                          unicode(self._pckdict[b'info'], 'ascii', 'replace'),
                          "We don't fall back to replacing non-ascii chars")
@@ -394,7 +399,9 @@ class TestMemberActionImport(unittest.TestCase):
             )
 
     def _do_test(self, expected):
-        import_config_pck(self._mlist, self._pckdict)
+        # Suppress warning messages in the test output.
+        with mock.patch('sys.stderr'):
+            import_config_pck(self._mlist, self._pckdict)
         for key, value in expected.iteritems():
             self.assertEqual(getattr(self._mlist, key), value)
 
@@ -514,7 +521,9 @@ class TestConvertToURI(unittest.TestCase):
             self._pckdict[b'mail_host'] = b'test.example.com'
             self._pckdict[str(oldvar)] = test_value
             old_value = getattr(self._mlist, newvar)
-            import_config_pck(self._mlist, self._pckdict)
+            # Suppress warning messages in the test output.
+            with mock.patch('sys.stderr'):
+                import_config_pck(self._mlist, self._pckdict)
             new_value = getattr(self._mlist, newvar)
             self.assertEqual(old_value, new_value,
                 'Default value was not preserved for %s' % newvar)
@@ -718,7 +727,9 @@ class TestRosterImport(unittest.TestCase):
         anne_addr = self._usermanager.create_address(
             'anne@example.com', 'Anne')
         self._mlist.subscribe(anne_addr)
-        import_config_pck(self._mlist, self._pckdict)
+        # Suppress warning messages in test output.
+        with mock.patch('sys.stderr'):
+            import_config_pck(self._mlist, self._pckdict)
         anne = self._usermanager.get_user('anne@example.com')
         self.assertTrue(anne.controls('anne@example.com'))
 
diff --git a/src/mailman/utilities/tests/test_wrap.py b/src/mailman/utilities/tests/test_wrap.py
index 8d756e156..eca6f93be 100644
--- a/src/mailman/utilities/tests/test_wrap.py
+++ b/src/mailman/utilities/tests/test_wrap.py
@@ -17,7 +17,7 @@
 
 """Test text wrapping."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
diff --git a/src/mailman/utilities/uid.py b/src/mailman/utilities/uid.py
index c1df36789..4fe862868 100644
--- a/src/mailman/utilities/uid.py
+++ b/src/mailman/utilities/uid.py
@@ -21,7 +21,7 @@ Use these functions to create unique ids rather than inlining calls to hashlib
 and whatnot.  These are better instrumented for testing purposes.
 """
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [