Merge branch 'release/4.0.1'

.gitignore

@@ -1,6 +1,31 @@
+*.py[co]
+
+# Packaging
+*.egg
 *.egg-info
-*.pyc
+dist
+build
+eggs
+.eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
 .coverage
-build/
-dist/
-examples/local.py
+.tox
+.cache
+htmlcov
+coverage.xml
+
+# Translations
+*.mo
+
+# Mac
+.DS_Store

.travis.yml

@@ -0,0 +1,31 @@
+language: python
+sudo: false
+
+branches:
+  except:
+    - /^feature/.*$/
+
+python:
+  - pypy
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+
+install: travis_retry .travis/install.sh
+
+script:
+  - python setup.py test
+  - codecov --file coverage.xml
+
+notifications:
+  irc:
+    channels:
+      - 'irc.freenode.org#webcore'
+    use_notice: true
+    skip_join: true
+    on_success: change
+    on_failure: always
+    template:
+      - "%{repository_slug}:%{branch}@%{commit} %{message}"
+      - "Duration: %{duration} - Details: %{build_url}"

.travis/install.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+set -x
+
+git config --global user.email "[email protected]"
+git config --global user.name "Travis: Marrow"
+
+pip install --upgrade setuptools 'pip<8.0.0' pytest
+pip install codecov
+
+pip install -e .[develop]

LICENSE.txt

@@ -0,0 +1,7 @@
+Copyright © 2006-2016 Alice Bevan-McGregor and contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.textile

@@ -1,12 +1,12 @@
 h1(#title). Marrow Mailer
 
-bq(subtitle). A highly efficient and modular mail delivery framework for Python 2.6+ and 3.1+, formerly called TurboMail.
+bq(subtitle). A highly efficient and modular mail delivery framework for Python 2.6+ and 3.2+, formerly called TurboMail.
 
-bq(byline). (C) 2006-2011, Alice Bevan-McGregor and contributors.
+bq(byline). (C) 2006-2016, Alice Bevan-McGregor and contributors.
 
-bq(byline). "https://github.com/marrow/marrow.mailer":github-project
+bq(byline). "https://github.com/marrow/mailer":github-project
 
-[github-project]https://github.com/marrow/marrow.mailer
+[github-project]https://github.com/marrow/mailer
 
 
 
@@ -22,7 +22,7 @@ By using Marrow Mailer you can:
 * Deliver e-mail through a number of alternative transports including SMTP, Amazon SES, sendmail, or even via direct on-disk mbox/maildir.
 * Multiple simultaneous configurations for more targeted delivery.
 
-Mailer supports Python 2.6+ and 3.1+ and there are only light-weight dependencies: @marrow.util@ and @boto@ if using Amazon SES.
+Mailer supports Python 2.6+ and 3.2+ and there are only light-weight dependencies: @marrow.util@, @marrow.interface@, and @boto@ if using Amazon SES.
 
 
 h3(#goals). %1.1.% Goals
@@ -46,16 +46,16 @@ If you add @marrow.mailer@ to the @install_requires@ argument of the call to @se
 
 h3(#install-dev). %2.1.% Development Version
 
-Development takes place on "GitHub":github in the "marrow.mailer":github-project project.  Issue tracking, documentation, and downloads are provided there.
+Development takes place on "GitHub":github in the "marrow/mailer":github-project project.  Issue tracking, documentation, and downloads are provided there.
 
 Installing the current development version requires "Git":git, a distributed source code management system.  If you have Git, you can run the following to download and _link_ the development version into your Python runtime:
 
-<pre><code>git clone https://github.com/marrow/marrow.mailer.git
-(cd marrow.mailer; python setup.py develop)</code></pre>
+<pre><code>git clone https://github.com/marrow/mailer.git
+(cd mailer; python setup.py develop)</code></pre>
 
 You can upgrade to the latest version at any time:
 
-<pre><code>(cd marrow.mailer; git pull; python setup.py develop)</code></pre>
+<pre><code>(cd mailer; git pull; python setup.py develop)</code></pre>
 
 If you would like to make changes and contribute them back to the project, fork the GitHub project, make your changes, and submit a pull request.  This process is beyond the scope of this documentation; for more information, see "GitHub's documentation":github-help.
 
@@ -154,7 +154,7 @@ fn1. The message bodies may be callables which will be executed when the message
 Any of these attributes can also be defined within your mailer configuration.  When you wish to use default values from the configuration you must use the @Mailer.new()@ factory method.  For example:
 
 <pre><code>mail = Mailer({
-        'message.author': 'Example User <[email protected]',
+        'message.author': 'Example User <[email protected]>',
         'message.subject': "Test subject."
     })
 message = mail.new()
@@ -441,12 +441,12 @@ table(exceptions).
 
 h2(#license). %8.% License
 
-Marrow Tags has been released under the MIT Open Source license.
+Marrow Mailer has been released under the MIT Open Source license.
 
 
 h3(#license-mit). %8.1.% The MIT License
 
-Copyright (C) 2006-2011 Alice Bevan-McGregor and contributors.
+Copyright (C) 2006-2016 Alice Bevan-McGregor and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -458,4 +458,4 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 fn1. In order to run the full test suite you need to install "pymta":http://www.schwarz.eu/opensource/projects/pymta/ and its dependencies.
 
-fn2. If "Pip":http://www.pip-installer.org/ is not available for you, you can use @easy_install@ instead. We have much love for Pip and "Distribute":http://packages.python.org/distribute/, though.
+fn2. If "Pip":http://www.pip-installer.org/ is not available for you, you can use @easy_install@ instead. We have much love for Pip and "Distribute":http://packages.python.org/distribute/, though.