Merge lp:~barry/lazr.smtptest/lp1096475 into lp:lazr.smtptest

[Barry Warsaw]

Ported to Python 3. This should now work on 3.3, 3.2, 2.7, and 2.6

I did a bunch of other cleanups, which may or may not be controversial, but makes things much simpler for me.

* Removed the dependency on zc.buildout. I didn't really feel this was buying us much and more standard Python tools like virtualenv and distribute do just fine.

* Moved the lazr directory up one. `src` wasn't buying us much.

* Ported the test suite to nosetests. See HACKING.rst for details.

* Ported to distribute.

* Yes, renamed all documentation to .rst files for better editor support (i.e. rst-mode)

* Updated copyright years.

* Got rid of pylint. Too many false positives to be useful (should be pretty pyflakes clean though).

* Under Python 3.3, use PEP 420 style namespace package for `lazr`.

[Barry Warsaw (barry)]

Oh yeah, bumped the version number to 2.0

I'll happily do a PyPI release once this lands.

[lp:~barry/lazr.smtptest/lp1096475]

72. By Barry Warsaw on 2013-01-07

Update the manifest.

[Curtis Hovey (sinzui)]

Thank you Barry.

This looks good for merge and release.

review: Approve (code)

=== renamed file 'HACKING.txt' => 'HACKING.rst'
--- HACKING.txt	2009-06-22 22:40:16 +0000
+++ HACKING.rst	2013-01-07 01:00:29 +0000
@@ -13,8 +13,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with lazr.smtptest.  If not, see <http://www.gnu.org/licenses/>.
 
-This project uses zc.buildout for development.
-
 ============
 Introduction
 ============
@@ -26,7 +24,7 @@
 
 
 Getting help
-------------
+============
 
 If you find bugs in this package, you can report them here:
 
@@ -39,3 +37,19 @@
 or send a message to:
 
     [e-mail]
+
+
+Running the tests
+=================
+
+The tests suite requires nose_ and is compatible with both Python 2 and
+Python 3.  To run the full test suite::
+
+    $ python setup.py nosetests
+
+Where ``python`` is the Python executable to use for the tests.  E.g. this
+might be ``python3`` for Python 3, or the Python executable from a
+virtualenv_.
+
+.. _nose: https://nose.readthedocs.org/en/latest/
+.. _virtualenv: http://www.virtualenv.org/en/latest/

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2009-06-22 22:40:16 +0000
+++ MANIFEST.in	2013-01-07 01:00:29 +0000
@@ -1,4 +1,3 @@
 include *.py *.rc *.txt
-recursive-include src *.txt
-exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
-prune _bootstrap
+recursive-include *.txt
+exclude MANIFEST.in .bzrignore

=== renamed file 'README.txt' => 'README.rst'
--- README.txt	2009-06-23 00:27:13 +0000
+++ README.rst	2013-01-07 01:00:29 +0000
@@ -7,9 +7,9 @@
     under the terms of the GNU Lesser General Public License as published by
     the Free Software Foundation, version 3 of the License.
 
-    lazr.smtptest is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+    lazr.smtptest is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
     License for more details.
 
     You should have received a copy of the GNU Lesser General Public License

=== removed directory '_bootstrap'
=== removed file '_bootstrap/COPYRIGHT.txt'
--- _bootstrap/COPYRIGHT.txt	2009-03-23 19:12:50 +0000
+++ _bootstrap/COPYRIGHT.txt	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-Copyright (c) 2004-2009 Zope Corporation and Contributors.
-All Rights Reserved.
-
-This software is subject to the provisions of the Zope Public License,
-Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-FOR A PARTICULAR PURPOSE.

=== removed file '_bootstrap/LICENSE.txt'
--- _bootstrap/LICENSE.txt	2009-03-23 19:12:50 +0000
+++ _bootstrap/LICENSE.txt	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-Zope Public License (ZPL) Version 2.1
--------------------------------------
-
-A copyright notice accompanies this license document that
-identifies the copyright holders.
-
-This license has been certified as open source. It has also
-been designated as GPL compatible by the Free Software
-Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
-
-1. Redistributions in source code must retain the
-   accompanying copyright notice, this list of conditions,
-   and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying
-   copyright notice, this list of conditions, and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to
-   endorse or promote products derived from this software
-   without prior written permission from the copyright
-   holders.
-
-4. The right to distribute this software or to use it for
-   any purpose does not give you the right to use
-   Servicemarks (sm) or Trademarks (tm) of the copyright
-   holders. Use of them is covered by separate agreement
-   with the copyright holders.
-
-5. If any files are modified, you must cause the modified
-   files to carry prominent notices stating that you changed
-   the files and the date of any change.
-
-Disclaimer
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
-  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-  NO EVENT SHALL THE COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-  DAMAGE.
\ No newline at end of file

=== removed file '_bootstrap/bootstrap.py'
--- _bootstrap/bootstrap.py	2009-03-23 19:12:50 +0000
+++ _bootstrap/bootstrap.py	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Bootstrap a buildout-based project
-
-Simply run this script in a directory containing a buildout.cfg.
-The script accepts buildout command-line options, so you can
-use the -c option to specify an alternate configuration file.
-
-$Id$
-"""
-
-import os, shutil, sys, tempfile, urllib2
-
-tmpeggs = tempfile.mkdtemp()
-
-is_jython = sys.platform.startswith('java')
-
-try:
-    import pkg_resources
-except ImportError:
-    ez = {}
-    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
-                         ).read() in ez
-    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
-
-    import pkg_resources
-
-if sys.platform == 'win32':
-    def quote(c):
-        if ' ' in c:
-            return '"%s"' % c # work around spawn lamosity on windows
-        else:
-            return c
-else:
-    def quote (c):
-        return c
-
-cmd = 'from setuptools.command.easy_install import main; main()'
-ws  = pkg_resources.working_set
-
-if is_jython:
-    import subprocess
-    
-    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd', 
-           quote(tmpeggs), 'zc.buildout'], 
-           env=dict(os.environ,
-               PYTHONPATH=
-               ws.find(pkg_resources.Requirement.parse('setuptools')).location
-               ),
-           ).wait() == 0
-
-else:
-    assert os.spawnle(
-        os.P_WAIT, sys.executable, quote (sys.executable),
-        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
-        dict(os.environ,
-            PYTHONPATH=
-            ws.find(pkg_resources.Requirement.parse('setuptools')).location
-            ),
-        ) == 0
-
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
-import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
-shutil.rmtree(tmpeggs)

=== removed symlink 'bootstrap.py'
=== target was u'_bootstrap/bootstrap.py'
=== removed directory 'buildout-templates'
=== removed directory 'buildout-templates/bin'
=== removed file 'buildout-templates/bin/lint.sh.in'
--- buildout-templates/bin/lint.sh.in	2009-06-22 22:40:16 +0000
+++ buildout-templates/bin/lint.sh.in	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#! /bin/bash
-
-export PYTHONPATH=${os-paths}
-bin/pylint ${package} --rcfile=pylint.rc

=== removed file 'buildout.cfg'
--- buildout.cfg	2009-06-22 22:40:16 +0000
+++ buildout.cfg	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-[buildout]
-parts =
-    interpreter
-    test
-    docs
-    tags
-    filetemplates
-    pylint
-unzip = true
-
-develop = .
-
-[test]
-recipe = zc.recipe.testrunner
-eggs = lazr.smtptest
-defaults = '--tests-pattern ^tests --exit-with-status --suite-name additional_tests'.split()
-
-[docs]
-recipe = z3c.recipe.sphinxdoc
-eggs = lazr.smtptest [docs]
-index-doc = README
-default.css =
-layout.html =
-
-[interpreter]
-recipe = zc.recipe.egg
-interpreter = py
-eggs = lazr.smtptest
-       docutils
-
-[tags]
-recipe = z3c.recipe.tag:tags
-eggs = lazr.smtptest
-
-[filetemplates]
-recipe = z3c.recipe.filetemplate
-source-directory = buildout-templates
-package = lazr.smtptest
-eggs = lazr.smtptest
-
-[pylint]
-recipe = zc.recipe.egg
-eggs =
-    logilab.pylintinstaller
-    pylint==0.15.2
-entry-points = pylint=pylint.lint:Run
-arguments = sys.argv[1:]

=== added file 'distribute_setup.py'
--- distribute_setup.py	1970-01-01 00:00:00 +0000
+++ distribute_setup.py	2013-01-07 01:00:29 +0000
@@ -0,0 +1,546 @@
+#!python
+"""Bootstrap distribute installation
+
+If you want to use setuptools in your package's setup.py, just include this
+file in the same directory with it, and add this to the top of your setup.py::
+
+    from distribute_setup import use_setuptools
+    use_setuptools()
+
+If you want to require a specific version of setuptools, set a download
+mirror, or use an alternate download directory, you can do so by supplying
+the appropriate options to ``use_setuptools()``.
+
+This file can also be run as a script to install or upgrade setuptools.
+"""
+import os
+import shutil
+import sys
+import time
+import fnmatch
+import tempfile
+import tarfile
+import optparse
+
+from distutils import log
+
+try:
+    from site import USER_SITE
+except ImportError:
+    USER_SITE = None
+
+try:
+    import subprocess
+
+    def _python_cmd(*args):
+        args = (sys.executable,) + args
+        return subprocess.call(args) == 0
+
+except ImportError:
+    # will be used for python 2.3
+    def _python_cmd(*args):
+        args = (sys.executable,) + args
+        # quoting arguments if windows
+        if sys.platform == 'win32':
+            def quote(arg):
+                if ' ' in arg:
+                    return '"%s"' % arg
+                return arg
+            args = [quote(arg) for arg in args]
+        return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
+
+DEFAULT_VERSION = "0.6.34"
+DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
+SETUPTOOLS_FAKED_VERSION = "0.6c11"
+
+SETUPTOOLS_PKG_INFO = """\
+Metadata-Version: 1.0
+Name: setuptools
+Version: %s
+Summary: xxxx
+Home-page: xxx
+Author: xxx
+Author-email: xxx
+License: xxx
+Description: xxx
+""" % SETUPTOOLS_FAKED_VERSION
+
+
+def _install(tarball, install_args=()):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s', tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        _extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s', subdir)
+
+        # installing
+        log.warn('Installing Distribute')
+        if not _python_cmd('setup.py', 'install', *install_args):
+            log.warn('Something went wrong during the installation.')
+            log.warn('See the error message above.')
+            # exitcode will be 2
+            return 2
+    finally:
+        os.chdir(old_wd)
+        shutil.rmtree(tmpdir)
+
+
+def _build_egg(egg, tarball, to_dir):
+    # extracting the tarball
+    tmpdir = tempfile.mkdtemp()
+    log.warn('Extracting in %s', tmpdir)
+    old_wd = os.getcwd()
+    try:
+        os.chdir(tmpdir)
+        tar = tarfile.open(tarball)
+        _extractall(tar)
+        tar.close()
+
+        # going in the directory
+        subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
+        os.chdir(subdir)
+        log.warn('Now working in %s', subdir)
+
+        # building an egg
+        log.warn('Building a Distribute egg in %s', to_dir)
+        _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
+
+    finally:
+        os.chdir(old_wd)
+        shutil.rmtree(tmpdir)
+    # returning the result
+    log.warn(egg)
+    if not os.path.exists(egg):
+        raise IOError('Could not build the egg.')
+
+
+def _do_download(version, download_base, to_dir, download_delay):
+    egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
+                       % (version, sys.version_info[0], sys.version_info[1]))
+    if not os.path.exists(egg):
+        tarball = download_setuptools(version, download_base,
+                                      to_dir, download_delay)
+        _build_egg(egg, tarball, to_dir)
+    sys.path.insert(0, egg)
+    import setuptools
+    setuptools.bootstrap_install_from = egg
+
+
+def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                   to_dir=os.curdir, download_delay=15, no_fake=True):
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
+    was_imported = 'pkg_resources' in sys.modules or \
+        'setuptools' in sys.modules
+    try:
+        try:
+            import pkg_resources
+            if not hasattr(pkg_resources, '_distribute'):
+                if not no_fake:
+                    _fake_setuptools()
+                raise ImportError
+        except ImportError:
+            return _do_download(version, download_base, to_dir, download_delay)
+        try:
+            pkg_resources.require("distribute>=" + version)
+            return
+        except pkg_resources.VersionConflict:
+            e = sys.exc_info()[1]
+            if was_imported:
+                sys.stderr.write(
+                "The required version of distribute (>=%s) is not available,\n"
+                "and can't be installed while this script is running. Please\n"
+                "install a more recent version first, using\n"
+                "'easy_install -U distribute'."
+                "\n\n(Currently using %r)\n" % (version, e.args[0]))
+                sys.exit(2)
+            else:
+                del pkg_resources, sys.modules['pkg_resources']    # reload ok
+                return _do_download(version, download_base, to_dir,
+                                    download_delay)
+        except pkg_resources.DistributionNotFound:
+            return _do_download(version, download_base, to_dir,
+                                download_delay)
+    finally:
+        if not no_fake:
+            _create_fake_setuptools_pkg_info(to_dir)
+
+
+def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
+                        to_dir=os.curdir, delay=15):
+    """Download distribute from a specified location and return its filename
+
+    `version` should be a valid distribute version number that is available
+    as an egg for download under the `download_base` URL (which should end
+    with a '/'). `to_dir` is the directory where the egg will be downloaded.
+    `delay` is the number of seconds to pause before an actual download
+    attempt.
+    """
+    # making sure we use the absolute path
+    to_dir = os.path.abspath(to_dir)
+    try:
+        from urllib.request import urlopen
+    except ImportError:
+        from urllib2 import urlopen
+    tgz_name = "distribute-%s.tar.gz" % version
+    url = download_base + tgz_name
+    saveto = os.path.join(to_dir, tgz_name)
+    src = dst = None
+    if not os.path.exists(saveto):  # Avoid repeated downloads
+        try:
+            log.warn("Downloading %s", url)
+            src = urlopen(url)
+            # Read/write all in one block, so we don't create a corrupt file
+            # if the download is interrupted.
+            data = src.read()
+            dst = open(saveto, "wb")
+            dst.write(data)
+        finally:
+            if src:
+                src.close()
+            if dst:
+                dst.close()
+    return os.path.realpath(saveto)
+
+
+def _no_sandbox(function):
+    def __no_sandbox(*args, **kw):
+        try:
+            from setuptools.sandbox import DirectorySandbox
+            if not hasattr(DirectorySandbox, '_old'):
+                def violation(*args):
+                    pass
+                DirectorySandbox._old = DirectorySandbox._violation
+                DirectorySandbox._violation = violation
+                patched = True
+            else:
+                patched = False
+        except ImportError:
+            patched = False
+
+        try:
+            return function(*args, **kw)
+        finally:
+            if patched:
+                DirectorySandbox._violation = DirectorySandbox._old
+                del DirectorySandbox._old
+
+    return __no_sandbox
+
+
+def _patch_file(path, content):
+    """Will backup the file then patch it"""
+    f = open(path)
+    existing_content = f.read()
+    f.close()
+    if existing_content == content:
+        # already patched
+        log.warn('Already patched.')
+        return False
+    log.warn('Patching...')
+    _rename_path(path)
+    f = open(path, 'w')
+    try:
+        f.write(content)
+    finally:
+        f.close()
+    return True
+
+_patch_file = _no_sandbox(_patch_file)
+
+
+def _same_content(path, content):
+    f = open(path)
+    existing_content = f.read()
+    f.close()
+    return existing_content == content
+
+
+def _rename_path(path):
+    new_name = path + '.OLD.%s' % time.time()
+    log.warn('Renaming %s to %s', path, new_name)
+    os.rename(path, new_name)
+    return new_name
+
+
+def _remove_flat_installation(placeholder):
+    if not os.path.isdir(placeholder):
+        log.warn('Unkown installation at %s', placeholder)
+        return False
+    found = False
+    for file in os.listdir(placeholder):
+        if fnmatch.fnmatch(file, 'setuptools*.egg-info'):
+            found = True
+            break
+    if not found:
+        log.warn('Could not locate setuptools*.egg-info')
+        return
+
+    log.warn('Moving elements out of the way...')
+    pkg_info = os.path.join(placeholder, file)
+    if os.path.isdir(pkg_info):
+        patched = _patch_egg_dir(pkg_info)
+    else:
+        patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
+
+    if not patched:
+        log.warn('%s already patched.', pkg_info)
+        return False
+    # now let's move the files out of the way
+    for element in ('setuptools', 'pkg_resources.py', 'site.py'):
+        element = os.path.join(placeholder, element)
+        if os.path.exists(element):
+            _rename_path(element)
+        else:
+            log.warn('Could not find the %s element of the '
+                     'Setuptools distribution', element)
+    return True
+
+_remove_flat_installation = _no_sandbox(_remove_flat_installation)
+
+
+def _after_install(dist):
+    log.warn('After install bootstrap.')
+    placeholder = dist.get_command_obj('install').install_purelib
+    _create_fake_setuptools_pkg_info(placeholder)
+
+
+def _create_fake_setuptools_pkg_info(placeholder):
+    if not placeholder or not os.path.exists(placeholder):
+        log.warn('Could not find the install location')
+        return
+    pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
+            (SETUPTOOLS_FAKED_VERSION, pyver)
+    pkg_info = os.path.join(placeholder, setuptools_file)
+    if os.path.exists(pkg_info):
+        log.warn('%s already exists', pkg_info)
+        return
+
+    log.warn('Creating %s', pkg_info)
+    try:
+        f = open(pkg_info, 'w')
+    except EnvironmentError:
+        log.warn("Don't have permissions to write %s, skipping", pkg_info)
+        return
+    try:
+        f.write(SETUPTOOLS_PKG_INFO)
+    finally:
+        f.close()
+
+    pth_file = os.path.join(placeholder, 'setuptools.pth')
+    log.warn('Creating %s', pth_file)
+    f = open(pth_file, 'w')
+    try:
+        f.write(os.path.join(os.curdir, setuptools_file))
+    finally:
+        f.close()
+
+_create_fake_setuptools_pkg_info = _no_sandbox(
+    _create_fake_setuptools_pkg_info
+)
+
+
+def _patch_egg_dir(path):
+    # let's check if it's already patched
+    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
+    if os.path.exists(pkg_info):
+        if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
+            log.warn('%s already patched.', pkg_info)
+            return False
+    _rename_path(path)
+    os.mkdir(path)
+    os.mkdir(os.path.join(path, 'EGG-INFO'))
+    pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
+    f = open(pkg_info, 'w')
+    try:
+        f.write(SETUPTOOLS_PKG_INFO)
+    finally:
+        f.close()
+    return True
+
+_patch_egg_dir = _no_sandbox(_patch_egg_dir)
+
+
+def _before_install():
+    log.warn('Before install bootstrap.')
+    _fake_setuptools()
+
+
+def _under_prefix(location):
+    if 'install' not in sys.argv:
+        return True
+    args = sys.argv[sys.argv.index('install') + 1:]
+    for index, arg in enumerate(args):
+        for option in ('--root', '--prefix'):
+            if arg.startswith('%s=' % option):
+                top_dir = arg.split('root=')[-1]
+                return location.startswith(top_dir)
+            elif arg == option:
+                if len(args) > index:
+                    top_dir = args[index + 1]
+                    return location.startswith(top_dir)
+        if arg == '--user' and USER_SITE is not None:
+            return location.startswith(USER_SITE)
+    return True
+
+
+def _fake_setuptools():
+    log.warn('Scanning installed packages')
+    try:
+        import pkg_resources
+    except ImportError:
+        # we're cool
+        log.warn('Setuptools or Distribute does not seem to be installed.')
+        return
+    ws = pkg_resources.working_set
+    try:
+        setuptools_dist = ws.find(
+            pkg_resources.Requirement.parse('setuptools', replacement=False)
+            )
+    except TypeError:
+        # old distribute API
+        setuptools_dist = ws.find(
+            pkg_resources.Requirement.parse('setuptools')
+        )
+
+    if setuptools_dist is None:
+        log.warn('No setuptools distribution found')
+        return
+    # detecting if it was already faked
+    setuptools_location = setuptools_dist.location
+    log.warn('Setuptools installation detected at %s', setuptools_location)
+
+    # if --root or --preix was provided, and if
+    # setuptools is not located in them, we don't patch it
+    if not _under_prefix(setuptools_location):
+        log.warn('Not patching, --root or --prefix is installing Distribute'
+                 ' in another location')
+        return
+
+    # let's see if its an egg
+    if not setuptools_location.endswith('.egg'):
+        log.warn('Non-egg installation')
+        res = _remove_flat_installation(setuptools_location)
+        if not res:
+            return
+    else:
+        log.warn('Egg installation')
+        pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO')
+        if (os.path.exists(pkg_info) and
+            _same_content(pkg_info, SETUPTOOLS_PKG_INFO)):
+            log.warn('Already patched.')
+            return
+        log.warn('Patching...')
+        # let's create a fake egg replacing setuptools one
+        res = _patch_egg_dir(setuptools_location)
+        if not res:
+            return
+    log.warn('Patching complete.')
+    _relaunch()
+
+
+def _relaunch():
+    log.warn('Relaunching...')
+    # we have to relaunch the process
+    # pip marker to avoid a relaunch bug
+    _cmd1 = ['-c', 'install', '--single-version-externally-managed']
+    _cmd2 = ['-c', 'install', '--record']
+    if sys.argv[:3] == _cmd1 or sys.argv[:3] == _cmd2:
+        sys.argv[0] = 'setup.py'
+    args = [sys.executable] + sys.argv
+    sys.exit(subprocess.call(args))
+
+
+def _extractall(self, path=".", members=None):
+    """Extract all members from the archive to the current working
+       directory and set owner, modification time and permissions on
+       directories afterwards. `path' specifies a different directory
+       to extract to. `members' is optional and must be a subset of the
+       list returned by getmembers().
+    """
+    import copy
+    import operator
+    from tarfile import ExtractError
+    directories = []
+
+    if members is None:
+        members = self
+
+    for tarinfo in members:
+        if tarinfo.isdir():
+            # Extract directories with a safe mode.
+            directories.append(tarinfo)
+            tarinfo = copy.copy(tarinfo)
+            tarinfo.mode = 448  # decimal for oct 0700
+        self.extract(tarinfo, path)
+
+    # Reverse sort directories.
+    if sys.version_info < (2, 4):
+        def sorter(dir1, dir2):
+            return cmp(dir1.name, dir2.name)
+        directories.sort(sorter)
+        directories.reverse()
+    else:
+        directories.sort(key=operator.attrgetter('name'), reverse=True)
+
+    # Set correct owner, mtime and filemode on directories.
+    for tarinfo in directories:
+        dirpath = os.path.join(path, tarinfo.name)
+        try:
+            self.chown(tarinfo, dirpath)
+            self.utime(tarinfo, dirpath)
+            self.chmod(tarinfo, dirpath)
+        except ExtractError:
+            e = sys.exc_info()[1]
+            if self.errorlevel > 1:
+                raise
+            else:
+                self._dbg(1, "tarfile: %s" % e)
+
+
+def _build_install_args(options):
+    """
+    Build the arguments to 'python setup.py install' on the distribute package
+    """
+    install_args = []
+    if options.user_install:
+        if sys.version_info < (2, 6):
+            log.warn("--user requires Python 2.6 or later")
+            raise SystemExit(1)
+        install_args.append('--user')
+    return install_args
+
+def _parse_args():
+    """
+    Parse the command line for options
+    """
+    parser = optparse.OptionParser()
+    parser.add_option(
+        '--user', dest='user_install', action='store_true', default=False,
+        help='install in user site package (requires Python 2.6 or later)')
+    parser.add_option(
+        '--download-base', dest='download_base', metavar="URL",
+        default=DEFAULT_URL,
+        help='alternative URL from where to download the distribute package')
+    options, args = parser.parse_args()
+    # positional arguments are ignored
+    return options
+
+def main(version=DEFAULT_VERSION):
+    """Install or upgrade setuptools and EasyInstall"""
+    options = _parse_args()
+    tarball = download_setuptools(download_base=options.download_base)
+    return _install(tarball, _build_install_args(options))
+
+if __name__ == '__main__':
+    sys.exit(main())

=== removed file 'ez_setup.py'
--- ez_setup.py	2009-03-16 15:17:16 +0000
+++ ez_setup.py	1970-01-01 00:00:00 +0000
@@ -1,241 +0,0 @@
-#!python
-"""Bootstrap setuptools installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
-    from ez_setup import use_setuptools
-    use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import sys
-DEFAULT_VERSION = "0.6c8"
-DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
-
-md5_data = {
-    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
-    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
-    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
-    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
-    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
-    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
-    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
-    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
-    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
-    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
-    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
-    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
-    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
-    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e',
-    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e',
-    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f',
-    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2',
-    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc',
-    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167',
-    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64',
-    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d',
-    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20',
-    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab',
-    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53',
-    'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2',
-    'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
-    'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
-    'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
-    'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
-    'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
-}
-
-import sys, os
-
-def _validate_md5(egg_name, data):
-    if egg_name in md5_data:
-        from md5 import md5
-        digest = md5(data).hexdigest()
-        if digest != md5_data[egg_name]:
-            print >>sys.stderr, (
-                "md5 validation of %s failed!  (Possible download problem?)"
-                % egg_name
-            )
-            sys.exit(2)
-    return data
-
-
-def use_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    download_delay=15, min_version=None
-):
-    """Automatically find/download setuptools and make it available on sys.path
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end with
-    a '/').  `to_dir` is the directory where setuptools will be downloaded, if
-    it is not already available.  If `download_delay` is specified, it should
-    be the number of seconds that will be paused before initiating a download,
-    should one be required.  If an older version of setuptools is installed,
-    this routine will print a message to ``sys.stderr`` and raise SystemExit in
-    an attempt to abort the calling script.
-    """
-    # Work around a hack in the ez_setup.py file from simplejson==1.7.3.
-    if min_version:
-        version = min_version
-
-    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
-    def do_download():
-        egg = download_setuptools(version, download_base, to_dir, download_delay)
-        sys.path.insert(0, egg)
-        import setuptools; setuptools.bootstrap_install_from = egg
-    try:
-        import pkg_resources
-    except ImportError:
-        return do_download()       
-    try:
-        pkg_resources.require("setuptools>="+version); return
-    except pkg_resources.VersionConflict, e:
-        if was_imported:
-            print >>sys.stderr, (
-            "The required version of setuptools (>=%s) is not available, and\n"
-            "can't be installed while this script is running. Please install\n"
-            " a more recent version first, using 'easy_install -U setuptools'."
-            "\n\n(Currently using %r)"
-            ) % (version, e.args[0])
-            sys.exit(2)
-        else:
-            del pkg_resources, sys.modules['pkg_resources']    # reload ok
-            return do_download()
-    except pkg_resources.DistributionNotFound:
-        return do_download()
-
-def download_setuptools(
-    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    delay = 15
-):
-    """Download setuptools from a specified location and return its filename
-
-    `version` should be a valid setuptools version number that is available
-    as an egg for download under the `download_base` URL (which should end
-    with a '/'). `to_dir` is the directory where the egg will be downloaded.
-    `delay` is the number of seconds to pause before an actual download attempt.
-    """
-    import urllib2, shutil
-    egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
-    url = download_base + egg_name
-    saveto = os.path.join(to_dir, egg_name)
-    src = dst = None
-    if not os.path.exists(saveto):  # Avoid repeated downloads
-        try:
-            from distutils import log
-            if delay:
-                log.warn("""
----------------------------------------------------------------------------
-This script requires setuptools version %s to run (even to display
-help).  I will attempt to download it for you (from
-%s), but
-you may need to enable firewall access for this script first.
-I will start the download in %d seconds.
-
-(Note: if this machine does not have network access, please obtain the file
-
-   %s
-
-and place it in this directory before rerunning this script.)
----------------------------------------------------------------------------""",
-                    version, download_base, delay, url
-                ); from time import sleep; sleep(delay)
-            log.warn("Downloading %s", url)
-            src = urllib2.urlopen(url)
-            # Read/write all in one block, so we don't create a corrupt file
-            # if the download is interrupted.
-            data = _validate_md5(egg_name, src.read())
-            dst = open(saveto,"wb"); dst.write(data)
-        finally:
-            if src: src.close()
-            if dst: dst.close()
-    return os.path.realpath(saveto)
-
-def main(argv, version=DEFAULT_VERSION):
-    """Install or upgrade setuptools and EasyInstall"""
-    try:
-        import setuptools
-    except ImportError:
-        egg = None
-        try:
-            egg = download_setuptools(version, delay=0)
-            sys.path.insert(0,egg)
-            from setuptools.command.easy_install import main
-            return main(list(argv)+[egg])   # we're done here
-        finally:
-            if egg and os.path.exists(egg):
-                os.unlink(egg)
-    else:
-        if setuptools.__version__ == '0.0.1':
-            print >>sys.stderr, (
-            "You have an obsolete version of setuptools installed.  Please\n"
-            "remove it from your system entirely before rerunning this script."
-            )
-            sys.exit(2)
-
-    req = "setuptools>="+version
-    import pkg_resources
-    try:
-        pkg_resources.require(req)
-    except pkg_resources.VersionConflict:
-        try:
-            from setuptools.command.easy_install import main
-        except ImportError:
-            from easy_install import main
-        main(list(argv)+[download_setuptools(delay=0)])
-        sys.exit(0) # try to force an exit
-    else:
-        if argv:
-            from setuptools.command.easy_install import main
-            main(argv)
-        else:
-            print "Setuptools version",version,"or greater has been installed."
-            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
-
-def update_md5(filenames):
-    """Update our built-in md5 registry"""
-
-    import re
-    from md5 import md5
-
-    for name in filenames:
-        base = os.path.basename(name)
-        f = open(name,'rb')
-        md5_data[base] = md5(f.read()).hexdigest()
-        f.close()
-
-    data = ["    %r: %r,\n" % it for it in md5_data.items()]
-    data.sort()
-    repl = "".join(data)
-
-    import inspect
-    srcfile = inspect.getsourcefile(sys.modules[__name__])
-    f = open(srcfile, 'rb'); src = f.read(); f.close()
-
-    match = re.search("\nmd5_data = {\n([^}]+)}", src)
-    if not match:
-        print >>sys.stderr, "Internal error!"
-        sys.exit(2)
-
-    src = src[:match.start(1)] + repl + src[match.end(1):]
-    f = open(srcfile,'w')
-    f.write(src)
-    f.close()
-
-
-if __name__=='__main__':
-    if len(sys.argv)>2 and sys.argv[1]=='--md5update':
-        update_md5(sys.argv[2:])
-    else:
-        main(sys.argv[1:])
-
-
-
-
-

=== renamed directory 'src/lazr' => 'lazr'
=== modified file 'lazr/__init__.py'
--- src/lazr/__init__.py	2009-06-09 03:00:20 +0000
+++ lazr/__init__.py	2013-01-07 01:00:29 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest.
 #
@@ -14,10 +14,14 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with lazr.smtptest.  If not, see <http://www.gnu.org/licenses/>.
 
-# this is a namespace package
-try:
-    import pkg_resources
-    pkg_resources.declare_namespace(__name__)
-except ImportError:
-    import pkgutil
-    __path__ = pkgutil.extend_path(__path__, __name__)
+# This is a namespace package, however under >= Python 3.3, let it be a true
+# namespace package (i.e. this cruft isn't necessary).
+import sys
+
+if sys.hexversion < 0x30300f0:
+    try:
+        import pkg_resources
+        pkg_resources.declare_namespace(__name__)
+    except ImportError:
+        import pkgutil
+        __path__ = pkgutil.extend_path(__path__, __name__)

=== renamed file 'src/lazr/smtptest/NEWS.txt' => 'lazr/smtptest/NEWS.rst'
--- src/lazr/smtptest/NEWS.txt	2011-07-06 21:06:55 +0000
+++ lazr/smtptest/NEWS.rst	2013-01-07 01:00:29 +0000
@@ -2,6 +2,16 @@
 NEWS for lazr.smtptest
 ======================
 
+2.0 (2013-01-05)
+================
+
+- Ported to Python 3.  Now support Python 2.6, 2.7, 3.2, and 3.3.
+
+- Removed the dependency on zc.buildout.
+
+- Use nose for testing.
+
+
 1.3 (2011-06-07)
 ================
 

=== renamed file 'src/lazr/smtptest/README.txt' => 'lazr/smtptest/README.rst'
--- src/lazr/smtptest/README.txt	2009-06-23 00:29:31 +0000
+++ lazr/smtptest/README.rst	2013-01-07 01:00:29 +0000
@@ -36,7 +36,7 @@
 The lazr.smtptest package is importable, and has a version number.
 
     >>> import lazr.smtptest
-    >>> print 'VERSION:', lazr.smtptest.__version__
+    >>> print('VERSION:', lazr.smtptest.__version__)
     VERSION: ...
 
 More information

=== added file 'lazr/smtptest/README_fixture.py'
--- lazr/smtptest/README_fixture.py	1970-01-01 00:00:00 +0000
+++ lazr/smtptest/README_fixture.py	2013-01-07 01:00:29 +0000
@@ -0,0 +1,27 @@
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.smtptest
+#
+# lazr.smtptest is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# lazr.smtptest is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with lazr.smtptest.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Doctest fixtures for running under nose."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    'globs',
+    ]
+
+
+from lazr.smtptest.docs.fixture import globs

=== modified file 'lazr/smtptest/__init__.py'
--- src/lazr/smtptest/__init__.py	2009-09-04 19:06:38 +0000
+++ lazr/smtptest/__init__.py	2013-01-07 01:00:29 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #

=== modified file 'lazr/smtptest/controller.py'
--- src/lazr/smtptest/controller.py	2009-06-30 00:40:38 +0000
+++ lazr/smtptest/controller.py	2013-01-07 01:00:29 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
@@ -16,6 +16,9 @@
 
 """The SMTP test controller."""
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+
 __metaclass__ = type
 __all__ = [
     'Controller',
@@ -27,12 +30,15 @@
 import smtplib
 import threading
 
-from Queue import Empty, Queue
+try:
+    from queue import Empty, Queue
+except ImportError:
+    # Python 2
+    from Queue import Empty, Queue
 
 from lazr.smtptest.server import QueueServer
 
 
-# pylint: disable-msg=C0103
 log = logging.getLogger('lazr.smtptest')
 
 

=== added file 'lazr/smtptest/docs/fixture.py'
--- lazr/smtptest/docs/fixture.py	1970-01-01 00:00:00 +0000
+++ lazr/smtptest/docs/fixture.py	2013-01-07 01:00:29 +0000
@@ -0,0 +1,34 @@
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.smtptest
+#
+# lazr.smtptest is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# lazr.smtptest is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with lazr.smtptest.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Doctest fixtures for running under nose."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    'globs',
+    ]
+
+
+def globs(globs):
+    """Set up globals for doctests."""
+    # Enable future statements to make Python 2 act more like Python 3.
+    globs['absolute_import'] = absolute_import
+    globs['print_function'] = print_function
+    globs['unicode_literals'] = unicode_literals
+    # Provide a convenient way to clean things up at the end of the test.
+    return globs

=== renamed file 'src/lazr/smtptest/docs/queue.txt' => 'lazr/smtptest/docs/queue.rst'
--- src/lazr/smtptest/docs/queue.txt	2009-06-30 00:40:38 +0000
+++ lazr/smtptest/docs/queue.rst	2013-01-07 01:00:29 +0000
@@ -13,7 +13,11 @@
 
 First, you need a queue.
 
-    >>> from Queue import Queue
+    >>> try:
+    ...     from queue import Empty, Queue
+    ... except ImportError:
+    ...     # Python 2
+    ...     from Queue import Empty, Queue
     >>> queue = Queue()
 
 Then you need a server.
@@ -34,8 +38,9 @@
 
     >>> import smtplib
     >>> smtpd = smtplib.SMTP()
-    >>> smtpd.connect('localhost', 9025)
-    (220, '... Python SMTP proxy version ...')
+    >>> code, helo = smtpd.connect('localhost', 9025)
+    >>> print(code, str(helo))
+    220 ... Python SMTP proxy version ...
 
     >>> smtpd.sendmail('[e-mail]', ['[e-mail]'], """\
     ... From: Irie Person <[e-mail]>
@@ -69,13 +74,12 @@
 
 All of these messages are available in the queue.
 
-    >>> from Queue import Empty
     >>> while True:
     ...     try:
     ...         message = queue.get_nowait()
     ...     except Empty:
     ...         break
-    ...     print message['message-id']
+    ...     print(message['message-id'])
     <elephant>
     <falcon>
     <goat>
@@ -95,8 +99,9 @@
     >>> controller.start()
 
     >>> smtpd = smtplib.SMTP()
-    >>> smtpd.connect('localhost', 9025)
-    (220, '... Python SMTP proxy version ...')
+    >>> code, helo = smtpd.connect('localhost', 9025)
+    >>> print(code, str(helo))
+    220 ... Python SMTP proxy version ...
 
 We now have an SMTP server that we can send some messages to.
 
@@ -133,7 +138,7 @@
 And we can dump out all the messages from the controller.
 
     >>> for message in controller:
-    ...     print message['message-id']
+    ...     print(message['message-id'])
     <horse>
     <iguana>
     <jackel>
@@ -151,7 +156,7 @@
     {}
 
     >>> for message in controller:
-    ...     print message['message-id']
+    ...     print(message['message-id'])
     <kangaroo>
 
 

=== added file 'lazr/smtptest/docs/queue_fixture.py'
--- lazr/smtptest/docs/queue_fixture.py	1970-01-01 00:00:00 +0000
+++ lazr/smtptest/docs/queue_fixture.py	2013-01-07 01:00:29 +0000
@@ -0,0 +1,27 @@
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.smtptest
+#
+# lazr.smtptest is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# lazr.smtptest is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with lazr.smtptest.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Doctest fixtures for running under nose."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    'globs',
+    ]
+
+
+from lazr.smtptest.docs.fixture import globs

=== renamed file 'src/lazr/smtptest/docs/usage.txt' => 'lazr/smtptest/docs/usage.rst'
--- src/lazr/smtptest/docs/usage.txt	2009-06-18 05:12:56 +0000
+++ lazr/smtptest/docs/usage.rst	2013-01-07 01:00:29 +0000
@@ -15,7 +15,11 @@
 message.  For example, you might want to pass the message between the threads
 via a Queue.
 
-    >>> from Queue import Queue
+    >>> try:
+    ...     from queue import Queue
+    ... except ImportError:
+    ...     # Python 2
+    ...     from Queue import Queue
     >>> queue = Queue()
 
     >>> class MyServer(Server):
@@ -32,8 +36,9 @@
 
     >>> from smtplib import SMTP
     >>> smtpd = SMTP()
-    >>> smtpd.connect('localhost', 9025)
-    (220, '... Python SMTP proxy version ...')
+    >>> code, helo = smtpd.connect('localhost', 9025)
+    >>> print(code, str(helo))
+    220 ... Python SMTP proxy version ...
 
 ...and send it a message.
 
@@ -50,7 +55,7 @@
 Now print the message that the server has just received.
 
     >>> message = queue.get()
-    >>> print message.as_string()
+    >>> print(message.as_string())
     From: Abby Person <[e-mail]>
     To: Bart Person <[e-mail]>
     Subject: A test
@@ -71,9 +76,9 @@
     >>> import socket
     >>> try:
     ...     smtpd.connect('localhost', 9025)
-    ... except socket.error, error:
-    ...     errno, message = error
-    ...     print message
+    ... except socket.error as error:
+    ...     errno, message = error.args
+    ...     print(message)
     Connection refused
 
 
@@ -109,8 +114,9 @@
 Now we can send a couple of messages to the server.
 
     >>> smtpd = SMTP()
-    >>> smtpd.connect('localhost', 9025)
-    (220, '... Python SMTP proxy version ...')
+    >>> code, helo = smtpd.connect('localhost', 9025)
+    >>> print(code, str(helo))
+    220 ... Python SMTP proxy version ...
 
     >>> smtpd.sendmail('[e-mail]', ['[e-mail]'], """\
     ... From: Cris Person <[e-mail]>
@@ -146,7 +152,7 @@
 
     >>> for message_id in sorted(message['message-id']
     ...                          for message in mailbox.Maildir(mailbox_dir)):
-    ...     print message_id
+    ...     print(message_id)
     <badger>
     <cougar>
     <dingo>
@@ -155,7 +161,7 @@
 
     >>> for message_id in sorted(message['message-id']
     ...                          for message in mailbox.Maildir(mailbox_dir)):
-    ...     print message_id
+    ...     print(message_id)
     <badger>
     <cougar>
     <dingo>

=== added file 'lazr/smtptest/docs/usage_fixture.py'
--- lazr/smtptest/docs/usage_fixture.py	1970-01-01 00:00:00 +0000
+++ lazr/smtptest/docs/usage_fixture.py	2013-01-07 01:00:29 +0000
@@ -0,0 +1,27 @@
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.smtptest
+#
+# lazr.smtptest is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, version 3 of the License.
+#
+# lazr.smtptest is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with lazr.smtptest.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Doctest fixtures for running under nose."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    'globs',
+    ]
+
+
+from lazr.smtptest.docs.fixture import globs

=== modified file 'lazr/smtptest/server.py'
--- src/lazr/smtptest/server.py	2011-07-06 21:06:55 +0000
+++ lazr/smtptest/server.py	2013-01-07 01:00:29 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
@@ -16,6 +16,9 @@
 
 """The SMTP test server."""
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+
 __metaclass__ = type
 __all__ = [
     'QueueServer',
@@ -28,12 +31,16 @@
 import logging
 import asyncore
 
-from Queue import Empty
+try:
+    from queue import Empty
+except ImportError:
+    # Python 2
+    from Queue import Empty
+
 from email import message_from_string
 
 
 COMMASPACE = ', '
-# pylint: disable-msg=C0103
 log = logging.getLogger('lazr.smtptest')
 
 
@@ -44,7 +51,6 @@
         self._server = server
         smtpd.SMTPChannel.__init__(self, server, connection, address)
 
-    # pylint: disable-msg=W0613
     def smtp_EXIT(self, argument):
         """EXIT - a new SMTP command to cleanly stop the server."""
         self.push('250 Ok')
@@ -61,7 +67,6 @@
         # asynchat/asyncore doesn't do it.
         try:
             return smtpd.SMTPChannel.send(self, data)
-        # pylint: disable-msg=W0704
         except socket.error:
             # Nothing here can affect the outcome.
             pass
@@ -123,7 +128,6 @@
         log.info('[SMTPServer] processed message: %s',
                  message.get('message-id', 'n/a'))
 
-    # pylint: disable-msg=R0201
     def start(self):
         """Start the asyncore loop."""
         log.info('[SMTPServer] starting asyncore loop')
@@ -134,7 +138,6 @@
         asyncore.close_all(map=self.socket_map)
         self.close()
 
-    # pylint: disable-msg=R0201
     def reset(self):
         """Do whatever you need to do on a reset."""
         log.info('[SMTPServer] reset')

=== modified file 'lazr/smtptest/tests/__init__.py'
--- src/lazr/smtptest/tests/__init__.py	2009-06-09 03:00:20 +0000
+++ lazr/smtptest/tests/__init__.py	2013-01-07 01:00:29 +0000
@@ -1,16 +0,0 @@
-# Copyright 2009 Canonical Ltd.  All rights reserved.
-#
-# This file is part of lazr.smtptest
-#
-# lazr.smtptest is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# lazr.smtptest is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-# License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with lazr.smtptest.  If not, see <http://www.gnu.org/licenses/>.
-"The lazr.smtptest tests."

=== modified file 'lazr/smtptest/version.txt'
--- src/lazr/smtptest/version.txt	2011-07-06 21:06:55 +0000
+++ lazr/smtptest/version.txt	2013-01-07 01:00:29 +0000
@@ -1,1 +1,1 @@
-1.3
+2.0

=== removed file 'pylint.rc'
--- pylint.rc	2009-06-17 02:41:00 +0000
+++ pylint.rc	1970-01-01 00:00:00 +0000
@@ -1,310 +0,0 @@
-# lint Python modules using external checkers.
-# 
-# This is the main checker controlling the other ones and the reports
-# generation. It is itself both a raw checker and an astng checker in order
-# to:
-# * handle message activation / deactivation at the module level
-# * handle some basic but necessary stats'data (number of classes, methods...)
-# 
-[MASTER]
-
-# Specify a configuration file.
-#rcfile=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Profiled execution.
-profile=no
-
-# Add <file or directory> to the black list. It should be a base name, not a
-# path. You may set this option multiple times.
-ignore=CVS
-
-# Pickle collected data for later comparisons.
-persistent=no
-
-# Set the cache size for astng objects.
-cache-size=500
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-
-[MESSAGES CONTROL]
-
-# Enable only checker(s) with the given id(s). This option conflicts with the
-# disable-checker option
-#enable-checker=
-
-# Enable all checker(s) except those with the given id(s). This option
-# conflicts with the enable-checker option
-#disable-checker=
-
-# Enable all messages in the listed categories.
-#enable-msg-cat=
-
-# Disable all messages in the listed categories.
-#disable-msg-cat=
-
-# Enable the message(s) with the given id(s).
-#enable-msg=
-
-# Disable the message(s) with the given id(s).
-# I0011: *Locally disabling %s*
-disable-msg=I0011
-
-
-[REPORTS]
-
-# Set the output format. Available formats are text, parseable, colorized, msvs
-# (visual studio) and html
-output-format=parseable
-
-# Include message's id in output
-include-ids=yes
-
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]".
-files-output=no
-
-# Tells wether to display a full report or only the messages
-reports=no
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectivly contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (R0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Add a comment according to your evaluation note. This is used by the global
-# evaluation report (R0004).
-comment=no
-
-# Enable the report(s) with the given id(s).
-#enable-report=
-
-# Disable the report(s) with the given id(s).
-#disable-report=
-
-
-# checks for :
-# * doc strings
-# * modules / classes / functions / methods / arguments / variables name
-# * number of arguments, local variables, branchs, returns and statements in
-# functions, methods
-# * required module attributes
-# * dangerous default values as arguments
-# * redefinition of function / method / class
-# * uses of the global statement
-# 
-[BASIC]
-
-# Required attributes for module, separated by a comma
-required-attributes=
-
-# Regular expression which should only match functions or classes name which do
-# not require a docstring
-no-docstring-rgx=__.*__
-
-# Regular expression which should only match correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Regular expression which should only match correct module level names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Regular expression which should only match correct class names
-class-rgx=[A-Z_][a-zA-Z0-9]+$
-
-# Regular expression which should only match correct function names
-function-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match correct method names
-method-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match correct instance attribute names
-attr-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match correct argument names
-argument-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match correct variable names
-variable-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match correct list comprehension /
-# generator expression variable names
-inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
-
-# Good variable names which should always be accepted, separated by a comma
-good-names=i,j,k,ex,Run,_
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=foo,bar,baz,toto,tutu,tata
-
-# List of builtins function names that should not be used, separated by a comma
-bad-functions=map,filter,apply,input
-
-
-# try to find bugs in the code using type inference
-# 
-[TYPECHECK]
-
-# Tells wether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# List of classes names for which member attributes should not be checked
-# (useful for classes with attributes dynamicaly set).
-ignored-classes=SQLObject
-
-# When zope mode is activated, add a predefined set of Zope acquired attributes
-# to generated-members.
-zope=no
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E0201 when accessed.
-generated-members=REQUEST,acl_users,aq_parent
-
-
-# checks for
-# * unused variables / imports
-# * undefined variables
-# * redefinition of variable from builtins or from an outer scope
-# * use of variable before assigment
-# 
-[VARIABLES]
-
-# Tells wether we should check for unused import in __init__ files.
-init-import=no
-
-# A regular expression matching names used for dummy variables (i.e. not used).
-dummy-variables-rgx=_|dummy
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
-
-
-# checks for :
-# * methods without self as first argument
-# * overridden methods signature
-# * access only to existant members via self
-# * attributes not defined in the __init__ method
-# * supported interfaces implementation
-# * unreachable code
-# 
-[CLASSES]
-
-# List of interface methods to ignore, separated by a comma. This is used for
-# instance to not check methods defines in Zope's Interface base class.
-ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,__new__,setUp
-
-
-# checks for sign of poor/misdesign:
-# * number of methods, attributes, local variables...
-# * size, complexity of functions, methods
-# 
-[DESIGN]
-
-# Maximum number of arguments for function / method
-max-args=5
-
-# Maximum number of locals for function / method body
-max-locals=15
-
-# Maximum number of return / yield for function / method body
-max-returns=6
-
-# Maximum number of branch for function / method body
-max-branchs=12
-
-# Maximum number of statements in function / method body
-max-statements=50
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of attributes for a class (see R0902).
-max-attributes=7
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=2
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=50
-
-
-# checks for
-# * external modules dependencies
-# * relative / wildcard imports
-# * cyclic imports
-# * uses of deprecated modules
-# 
-[IMPORTS]
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report R0402 must not be disabled)
-import-graph=
-
-# Create a graph of external dependencies in the given file (report R0402 must
-# not be disabled)
-ext-import-graph=
-
-# Create a graph of internal dependencies in the given file (report R0402 must
-# not be disabled)
-int-import-graph=
-
-
-# checks for :
-# * unauthorized constructions
-# * strict indentation
-# * line length
-# * use of <> instead of !=
-# 
-[FORMAT]
-
-# Maximum number of characters on a single line.
-max-line-length=80
-
-# Maximum number of lines in a module
-max-module-lines=1000
-
-# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
-# tab).
-indent-string='    '
-
-
-# checks for:
-# * warning notes in the code like FIXME, XXX
-# * PEP 263: source code with non ascii character but no encoding declaration
-# 
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-notes=FIXME,XXX,TODO
-
-
-# checks for similarities and duplicated code. This computation may be
-# memory / CPU intensive, so you should disable it if you experiments some
-# problems.
-# 
-[SIMILARITIES]
-
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2013-01-07 01:00:29 +0000
@@ -0,0 +1,8 @@
+[nosetests]
+verbosity=3
+with-coverage=1
+with-doctest=1
+doctest-extension=.rst
+doctest-options=+ELLIPSIS,+NORMALIZE_WHITESPACE,+REPORT_NDIFF
+doctest-fixtures=_fixture
+cover-package=lazr.smtptest

=== modified file 'setup.py'
--- setup.py	2009-09-04 19:06:38 +0000
+++ setup.py	2013-01-07 01:00:29 +0000
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-
-# Copyright 2009 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.smtptest
 #
@@ -16,10 +14,9 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with lazr.smtptest.  If not, see <http://www.gnu.org/licenses/>.
 
-import ez_setup
-ez_setup.use_setuptools()
+import distribute_setup
+distribute_setup.use_setuptools()
 
-import sys
 from setuptools import setup, find_packages
 
 # generic helpers primarily for the long_description
@@ -36,22 +33,21 @@
     return '\n'.join(res)
 # end generic helpers
 
-__version__ = open("src/lazr/smtptest/version.txt").read().strip()
+__version__ = open("lazr/smtptest/version.txt").read().strip()
 
 setup(
     name='lazr.smtptest',
     version=__version__,
     namespace_packages=['lazr'],
-    packages=find_packages('src'),
-    package_dir={'':'src'},
+    packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
     maintainer='LAZR Developers',
     maintainer_email='[e-mail]',
-    description=open('README.txt').readline().strip(),
+    description=open('README.rst').readline().strip(),
     long_description=generate(
-        'src/lazr/smtptest/README.txt',
-        'src/lazr/smtptest/NEWS.txt'),
+        'lazr/smtptest/README.rst',
+        'lazr/smtptest/NEWS.rst'),
     license='LGPL v3',
     install_requires=[
         'setuptools',
@@ -64,13 +60,10 @@
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
         "Operating System :: OS Independent",
-        "Programming Language :: Python"],
-    extras_require=dict(
-        docs=['Sphinx',
-              'z3c.recipe.sphinxdoc']
-    ),
-    # This does not play nicely with buildout because it downloads but does
-    # not cache the package.
-    #setup_requires=['eggtestinfo', 'setuptools_bzr'],
-    test_suite='lazr.smtptest.tests',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        ],
+    test_suite='nose.collector',
     )

=== removed directory 'src'
=== removed file 'src/lazr/smtptest/tests/test_docs.py'
--- src/lazr/smtptest/tests/test_docs.py	2009-06-17 02:41:00 +0000
+++ src/lazr/smtptest/tests/test_docs.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-# Copyright 2009 Canonical Ltd.  All rights reserved.
-#
-# This file is part of lazr.smtptest
-#
-# lazr.smtptest is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# lazr.smtptest is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-# License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with lazr.smtptest.  If not, see <http://www.gnu.org/licenses/>.
-"Test harness for doctests."
-
-# pylint: disable-msg=E0611,W0142
-
-__metaclass__ = type
-__all__ = [
-    'additional_tests',
-    ]
-
-import atexit
-import doctest
-import os
-# pylint: disable-msg=F0401
-from pkg_resources import (
-    resource_filename, resource_exists, resource_listdir, cleanup_resources)
-import unittest
-
-DOCTEST_FLAGS = (
-    doctest.ELLIPSIS |
-    doctest.NORMALIZE_WHITESPACE |
-    doctest.REPORT_NDIFF)
-
-
-def additional_tests():
-    "Run the doc tests (README.txt and docs/*, if any exist)"
-    doctest_files = [
-        os.path.abspath(resource_filename('lazr.smtptest', 'README.txt'))]
-    if resource_exists('lazr.smtptest', 'docs'):
-        for name in resource_listdir('lazr.smtptest', 'docs'):
-            if name.endswith('.txt'):
-                doctest_files.append(
-                    os.path.abspath(
-                        resource_filename('lazr.smtptest', 'docs/%s' % name)))
-    kwargs = dict(module_relative=False, optionflags=DOCTEST_FLAGS)
-    atexit.register(cleanup_resources)
-    return unittest.TestSuite((
-        doctest.DocFileSuite(*doctest_files, **kwargs)))