diff options
| author | Barry Warsaw | 2014-04-28 11:23:35 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2014-04-28 11:23:35 -0400 |
| commit | d4d71f71f08d6d440b17482eecc5472dcfe6cbae (patch) | |
| tree | 71f08b3d60f698883294eaa6d1bf366a095da011 /src/mailman/core | |
| parent | 7536530dcd8d6303c0a869e8c9c2cb2517b9b018 (diff) | |
| download | mailman-d4d71f71f08d6d440b17482eecc5472dcfe6cbae.tar.gz mailman-d4d71f71f08d6d440b17482eecc5472dcfe6cbae.tar.zst mailman-d4d71f71f08d6d440b17482eecc5472dcfe6cbae.zip | |
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.
Diffstat (limited to 'src/mailman/core')
| -rw-r--r-- | src/mailman/core/chains.py | 2 | ||||
| -rw-r--r-- | src/mailman/core/docs/runner.rst | 2 | ||||
| -rw-r--r-- | src/mailman/core/docs/switchboard.rst | 8 | ||||
| -rw-r--r-- | src/mailman/core/errors.py | 2 | ||||
| -rw-r--r-- | src/mailman/core/i18n.py | 2 | ||||
| -rw-r--r-- | src/mailman/core/logging.py | 2 | ||||
| -rw-r--r-- | src/mailman/core/rules.py | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/src/mailman/core/chains.py b/src/mailman/core/chains.py index ac6f5a50a..df4c199d5 100644 --- a/src/mailman/core/chains.py +++ b/src/mailman/core/chains.py @@ -17,7 +17,7 @@ """Application support for chain processing.""" -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import, print_function, unicode_literals __metaclass__ = type __all__ = [ diff --git a/src/mailman/core/docs/runner.rst b/src/mailman/core/docs/runner.rst index 00781578f..28eab9203 100644 --- a/src/mailman/core/docs/runner.rst +++ b/src/mailman/core/docs/runner.rst @@ -58,7 +58,7 @@ on instance variables. >>> filebase = switchboard.enqueue(msg, listname=mlist.fqdn_listname, ... foo='yes', bar='no') >>> runner.run() - >>> print runner.msg.as_string() + >>> print(runner.msg.as_string()) From: aperson@example.com To: test@example.com <BLANKLINE> diff --git a/src/mailman/core/docs/switchboard.rst b/src/mailman/core/docs/switchboard.rst index 751b1e640..c8d2de079 100644 --- a/src/mailman/core/docs/switchboard.rst +++ b/src/mailman/core/docs/switchboard.rst @@ -17,7 +17,7 @@ Create a switchboard by giving its queue name and directory. >>> queue_directory = os.path.join(config.QUEUE_DIR, 'test') >>> from mailman.core.switchboard import Switchboard >>> switchboard = Switchboard('test', queue_directory) - >>> print switchboard.name + >>> print(switchboard.name) test >>> switchboard.queue_directory == queue_directory True @@ -32,9 +32,9 @@ Here's a helper function for ensuring things work correctly. ... root, ext = os.path.splitext(qfile) ... files[ext] = files.get(ext, 0) + 1 ... if len(files) == 0: - ... print 'empty' + ... print('empty') ... for ext in sorted(files): - ... print '{0}: {1}'.format(ext, files[ext]) + ... print('{0}: {1}'.format(ext, files[ext])) Enqueing and dequeing @@ -50,7 +50,7 @@ dictionary. To read the contents of a queue file, dequeue it. >>> msg, msgdata = switchboard.dequeue(filebase) - >>> print msg.as_string() + >>> print(msg.as_string()) From: aperson@example.com To: _xtest@example.com <BLANKLINE> diff --git a/src/mailman/core/errors.py b/src/mailman/core/errors.py index 56f9948ce..b8f5a1f64 100644 --- a/src/mailman/core/errors.py +++ b/src/mailman/core/errors.py @@ -26,7 +26,7 @@ interfaces. """ -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import, print_function, unicode_literals __metaclass__ = type __all__ = [ diff --git a/src/mailman/core/i18n.py b/src/mailman/core/i18n.py index 80f1a6448..b078a985f 100644 --- a/src/mailman/core/i18n.py +++ b/src/mailman/core/i18n.py @@ -17,7 +17,7 @@ """Internationalization.""" -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import, print_function, unicode_literals __metaclass__ = type __all__ = [ diff --git a/src/mailman/core/logging.py b/src/mailman/core/logging.py index 27799a641..43030436a 100644 --- a/src/mailman/core/logging.py +++ b/src/mailman/core/logging.py @@ -17,7 +17,7 @@ """Logging initialization, using Python's standard logging package.""" -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import, print_function, unicode_literals __metaclass__ = type __all__ = [ diff --git a/src/mailman/core/rules.py b/src/mailman/core/rules.py index d527c62ea..1a2b9f56d 100644 --- a/src/mailman/core/rules.py +++ b/src/mailman/core/rules.py @@ -17,7 +17,7 @@ """Various rule helpers""" -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import, print_function, unicode_literals __metaclass__ = type __all__ = [ |
