Merge lp:~barry/lazr.delegates/lp1096513 into lp:lazr.delegates

[Barry Warsaw]

See bug for API changes and more details.

[lp:~barry/lazr.delegates/lp1096513]

19. By Barry Warsaw on 2013-01-07

Update the MANIFEST.

[Barry Warsaw (barry)]

On Jan 07, 2013, at 11:02 AM, Gavin Panella wrote:

>Review: Approve
>
>Looks good. Some minor points. I did a fairly quick once-over
>sanity-check rather than an in-depth review, so you might want to ask
>someone else to take a look if you think it warrants it.

Thanks for the review! You caught some great things.

I'll see if Gary or Curtis wants to take a look, otherwise I'll JFDI :).

BTW, what did you think of @delegate_to as the choice of name?

>+def delegate_to(*interfaces, **kws):
>+    context = kws.pop('context', 'context')
>+    if len(kws) > 0:
>+        raise TypeError('Too many arguments')
>+    def _decorator(cls):
>+        if len(interfaces) == 0:
>+            raise TypeError('At least one interface is required')
>
>I think it would make more sense to check interfaces at the same time
>as kws, i.e. in delegate_to, rather than _decorator.
>
>In both _python2.py and python3.py.

Good idea, fixed.

>--- lazr/delegates/docs/fixture.py 1970-01-01 00:00:00 +0000
>+++ lazr/delegates/docs/fixture.py 2013-01-07 10:44:28 +0000
>@@ -0,0 +1,34 @@
>+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
>+#
>+# This file is part of lazr.smtptest
>
>s/smtptest/delegates/
>
>In lazr/delegates/docs/usage_fixture.py too.

Fixed everywhere.

>+The ``@delegation`` decorator makes a class implement zero or more interfaces
>
>s/delegation/delegate_to/

Fixed.

>=== added file 'lazr/delegates/docs/usage_fixture.py'
>...
>+__all__ = [
>+    'globs',
>+    ]
>+
>+
>+from lazr.delegates.docs.fixture import globs
>
>What does this module do?

It's a nosetests artifact. AFAICT, under nose (which is generally pretty
awesome) the only way to add a fixture for a doctest is to provide a suffix
which is appended to the doctest base name. So, given "_fixture" as the
suffix, for usage.rst it will only search for usage_fixture.py.

In lazr.delegates case, that's not a big deal, but I copied this over from
lazr.smtptest (which I'm porting to Python 3 in a very similar way) and it has
more than one doctest. So the idea was to put the common fixtures in a shared
module, e.g. lazr.delegates.doc.fixture, and then import what's needed into
the nose-required module name.

BTW, I opened a bug on nose for making this nicer.

https://github.com/nose-devs/nose/issues/594

>+class TestAPI(unittest.TestCase):
>+    """Test various corner cases in the API."""
>+
>+    def test_no_interfaces(self):
>+        try:
>+            @delegate_to()
>+            class SomeClass(object):
>+                pass
>+        except TypeError:
>+            pass
>+        else:
>+            raise AssertionError('TypeError expected')
>
>assertRaises would be more concise, but I can see that there's some
>clarity here from using decorator syntax. Use self.fail() instead of
>`raise AssertionError`?

Yeah, I did it this way to use the syntax that you'd see more commonly in the
code. Good idea about self.fail() though - fixed!

Update pushed, and again, thanks!

Would you take a quick look at the lazr.smtptest mp?
https://code.launchpad.net/~barry/lazr.smtptest/lp1096475

[Gavin Panella (allenap)]

Looks good. Some minor points. I did a fairly quick once-over
sanity-check rather than an in-depth review, so you might want to ask
someone else to take a look if you think it warrants it.

[1]

+def delegate_to(*interfaces, **kws):
+    context = kws.pop('context', 'context')
+    if len(kws) > 0:
+        raise TypeError('Too many arguments')
+    def _decorator(cls):
+        if len(interfaces) == 0:
+            raise TypeError('At least one interface is required')

I think it would make more sense to check interfaces at the same time
as kws, i.e. in delegate_to, rather than _decorator.

In both _python2.py and python3.py.

[2]

--- lazr/delegates/docs/fixture.py 1970-01-01 00:00:00 +0000
+++ lazr/delegates/docs/fixture.py 2013-01-07 10:44:28 +0000
@@ -0,0 +1,34 @@
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.smtptest

s/smtptest/delegates/

In lazr/delegates/docs/usage_fixture.py too.

[3]

+The ``@delegation`` decorator makes a class implement zero or more interfaces

s/delegation/delegate_to/

[4]

=== added file 'lazr/delegates/docs/usage_fixture.py'
...
+__all__ = [
+    'globs',
+    ]
+
+
+from lazr.delegates.docs.fixture import globs

What does this module do?

[5]

+class TestAPI(unittest.TestCase):
+    """Test various corner cases in the API."""
+
+    def test_no_interfaces(self):
+        try:
+            @delegate_to()
+            class SomeClass(object):
+                pass
+        except TypeError:
+            pass
+        else:
+            raise AssertionError('TypeError expected')

assertRaises would be more concise, but I can see that there's some
clarity here from using decorator syntax. Use self.fail() instead of
`raise AssertionError`?

review: Approve

[lp:~barry/lazr.delegates/lp1096513]

20. By Barry Warsaw on 2013-01-07

Fixes based on Gavin Panella's review:

* delgate_to(): Check the length of *interfaces in the wrapper instead of in
  the embedded decorator.
* Fix typos.
* Use self.fail() instead of raising an AssertionError.

[Barry Warsaw (barry)]

On Jan 08, 2013, at 12:28 PM, Gavin Panella wrote:

>> BTW, what did you think of @delegate_to as the choice of name?
>
>It's good, and I can't think of anything better.
>
>...
>> Would you take a quick look at the lazr.smtptest mp?
>> https://code.launchpad.net/~barry/lazr.smtptest/lp1096475
>
>I was too late :)

Yeah, it's futile to try to beat Curtis. :)

Thanks!

[Gavin Panella (allenap)]

> BTW, what did you think of @delegate_to as the choice of name?

It's good, and I can't think of anything better.

...
> Would you take a quick look at the lazr.smtptest mp?
> https://code.launchpad.net/~barry/lazr.smtptest/lp1096475

I was too late :)

=== modified file '.bzrignore'
--- .bzrignore	2009-03-24 18:52:52 +0000
+++ .bzrignore	2013-01-07 15:18:26 +0000
@@ -9,3 +9,5 @@
 build
 *.egg
 dist
+__pycache__
+.coverage

=== renamed file 'HACKING.txt' => 'HACKING.rst'
--- HACKING.txt	2009-03-24 19:51:29 +0000
+++ HACKING.rst	2013-01-07 15:18:26 +0000
@@ -13,8 +13,6 @@
     You should have received a copy of the GNU Lesser General Public License
     along with lazr.delegates.  If not, see <http://www.gnu.org/licenses/>.
 
-This project uses zc.buildout for development.
-
 ============
 Introduction
 ============
@@ -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-08-29 17:51:36 +0000
+++ MANIFEST.in	2013-01-07 15:18:26 +0000
@@ -1,4 +1,3 @@
-include ez_setup.py
-recursive-include src *.txt *.pt *.zcml *.xsd
-exclude MANIFEST.in buildout.cfg bootstrap.py .bzrignore
-prune _bootstrap
+include distribute_setup.py
+recursive-include lazr *.txt *.pt *.zcml *.xsd
+exclude MANIFEST.in .bzrignore

=== renamed file 'README.txt' => 'README.rst'
=== removed directory '_bootstrap'
=== removed file '_bootstrap/COPYRIGHT.txt'
--- _bootstrap/COPYRIGHT.txt	2009-03-24 18:52:52 +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-24 18:52:52 +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-24 18:52:52 +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 file 'buildout.cfg'
--- buildout.cfg	2009-03-24 19:51:29 +0000
+++ buildout.cfg	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-[buildout]
-parts =
-    interpreter
-    test
-    docs
-    tags
-unzip = true
-
-develop = .
-
-[test]
-recipe = zc.recipe.testrunner
-eggs = lazr.delegates
-defaults = '--tests-pattern ^tests --exit-with-status --suite-name additional_tests'.split()
-
-[docs]
-recipe = z3c.recipe.sphinxdoc
-eggs = lazr.delegates [docs]
-index-doc = README
-default.css =
-layout.html =
-
-[interpreter]
-recipe = zc.recipe.egg
-interpreter = py
-eggs = lazr.delegates
-       docutils
-
-[tags]
-recipe = z3c.recipe.tag:tags
-eggs = lazr.delegates

=== added file 'distribute_setup.py'
--- distribute_setup.py	1970-01-01 00:00:00 +0000
+++ distribute_setup.py	2013-01-07 15:18:26 +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-24 18:52:52 +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-03-24 19:51:29 +0000
+++ lazr/__init__.py	2013-01-07 15:18:26 +0000
@@ -1,4 +1,4 @@
-# Copyright 2008 Canonical Ltd.  All rights reserved.
+# Copyright 2008-2013 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
@@ -14,10 +14,14 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with lazr.delegates.  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/delegates/NEWS.txt' => 'lazr/delegates/NEWS.rst'
--- src/lazr/delegates/NEWS.txt	2010-07-16 13:23:43 +0000
+++ lazr/delegates/NEWS.rst	2013-01-07 15:18:26 +0000
@@ -2,6 +2,12 @@
 NEWS for lazr.delegates
 =======================
 
+2.0 (2013-01-06)
+================
+
+- Port to Python 3, which requires the use of the ``@delegate_to`` class
+  decorator instead of the ``delegates()`` function call.
+
 1.2.0 (2010-07-16)
 ==================
 

=== modified file 'lazr/delegates/__init__.py'
--- src/lazr/delegates/__init__.py	2009-08-29 17:51:36 +0000
+++ lazr/delegates/__init__.py	2013-01-07 15:18:26 +0000
@@ -1,4 +1,4 @@
-# Copyright 2008 Canonical Ltd.  All rights reserved.
+# Copyright 2008-2013 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
@@ -16,12 +16,21 @@
 
 """Decorator helpers that simplify class composition."""
 
+__all__ = [
+    'delegate_to',
+    ]
+
+
 import pkg_resources
 __version__ = pkg_resources.resource_string(
     "lazr.delegates", "version.txt").strip()
 
-# While we generally frown on "*" imports, this, combined with the fact we
-# only test code from this module, means that we can verify what has been
-# exported.
-from lazr.delegates._delegates import *
-from lazr.delegates._delegates import __all__
+# The class decorator syntax is different in Python 2 vs. Python 3.
+import sys
+if sys.version_info[0] == 2:
+    from lazr.delegates._python2 import delegate_to
+    # The legacy API is only compatible with Python 2.
+    from lazr.delegates._delegates import delegates
+    __all__.append('delegates')
+else:
+    from lazr.delegates._python3 import delegate_to

=== modified file 'lazr/delegates/_delegates.py'
--- src/lazr/delegates/_delegates.py	2010-07-16 13:14:16 +0000
+++ lazr/delegates/_delegates.py	2013-01-07 15:18:26 +0000
@@ -1,4 +1,4 @@
-# Copyright 2008 Canonical Ltd.  All rights reserved.
+# Copyright 2008-2013 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
@@ -16,11 +16,13 @@
 
 """Decorator helpers that simplify class composition."""
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 
 __metaclass__ = type
-
-
-__all__ = ['delegates', 'Passthrough']
+__all__ = [
+    'delegates',
+    ]
 
 
 import sys
@@ -30,6 +32,8 @@
 from zope.interface import classImplements
 from zope.interface.interfaces import IInterface
 
+from lazr.delegates._passthrough import Passthrough
+
 
 def delegates(interface_spec, context='context'):
     """Make an adapter into a decorator.
@@ -91,7 +95,7 @@
     """
     interface_spec, contextvar = cls.__dict__['__delegates_advice_data__']
     del cls.__delegates_advice_data__
-    if type(cls) is ClassType:
+    if isinstance(cls, ClassType):
         raise TypeError(
             'Cannot use delegates() on a classic class: %s.' % cls)
     if IInterface.providedBy(interface_spec):
@@ -105,35 +109,3 @@
             if getattr(cls, name, not_found) is not_found:
                 setattr(cls, name, Passthrough(name, contextvar))
     return cls
-
-
-class Passthrough:
-    """Call the delegated class for the decorator class.
-
-    If the ``adaptation`` argument is not None, it should be a callable. It
-    will be called with the context, and should return an object that will
-    have the delegated attribute. The ``adaptation`` argument is expected to
-    be used with an interface, to adapt the context.
-    """
-    def __init__(self, name, contextvar, adaptation=None):
-        self.name = name
-        self.contextvar = contextvar
-        self.adaptation = adaptation
-
-    def __get__(self, inst, cls=None):
-        if inst is None:
-            return self
-        else:
-            context = getattr(inst, self.contextvar)
-            if self.adaptation is not None:
-                context = self.adaptation(context)
-            return getattr(context, self.name)
-
-    def __set__(self, inst, value):
-        context = getattr(inst, self.contextvar)
-        if self.adaptation is not None:
-            context = self.adaptation(context)
-        setattr(context, self.name, value)
-
-    def __delete__(self, inst):
-        raise NotImplementedError

=== added file 'lazr/delegates/_passthrough.py'
--- lazr/delegates/_passthrough.py	1970-01-01 00:00:00 +0000
+++ lazr/delegates/_passthrough.py	2013-01-07 15:18:26 +0000
@@ -0,0 +1,55 @@
+# Copyright 2008-2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.delegates.
+#
+# lazr.delegates 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.delegates 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.delegates.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+
+__metaclass__ = type
+__all__ = [
+    'Passthrough',
+    ]
+
+
+class Passthrough:
+    """Call the delegated class for the decorator class.
+
+    If the ``adaptation`` argument is not None, it should be a callable. It
+    will be called with the context, and should return an object that will
+    have the delegated attribute. The ``adaptation`` argument is expected to
+    be used with an interface, to adapt the context.
+    """
+    def __init__(self, name, contextvar, adaptation=None):
+        self.name = name
+        self.contextvar = contextvar
+        self.adaptation = adaptation
+
+    def __get__(self, inst, cls=None):
+        if inst is None:
+            return self
+        else:
+            context = getattr(inst, self.contextvar)
+            if self.adaptation is not None:
+                context = self.adaptation(context)
+            return getattr(context, self.name)
+
+    def __set__(self, inst, value):
+        context = getattr(inst, self.contextvar)
+        if self.adaptation is not None:
+            context = self.adaptation(context)
+        setattr(context, self.name, value)
+
+    def __delete__(self, inst):
+        raise NotImplementedError

=== added file 'lazr/delegates/_python2.py'
--- lazr/delegates/_python2.py	1970-01-01 00:00:00 +0000
+++ lazr/delegates/_python2.py	2013-01-07 15:18:26 +0000
@@ -0,0 +1,38 @@
+# Copyright 2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.delegates.
+#
+# lazr.delegates 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.delegates 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.delegates.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Class decorator definition for Python 2."""
+
+from zope.interface import classImplements
+
+from lazr.delegates._passthrough import Passthrough
+
+
+def delegate_to(*interfaces, **kws):
+    context = kws.pop('context', 'context')
+    if len(kws) > 0:
+        raise TypeError('Too many arguments')
+    if len(interfaces) == 0:
+        raise TypeError('At least one interface is required')
+    def _decorator(cls):
+        missing = object()
+        for interface in interfaces:
+            classImplements(cls, interface)
+            for name in interface:
+                if getattr(cls, name, missing) is missing:
+                    setattr(cls, name, Passthrough(name, context))
+        return cls
+    return _decorator

=== added file 'lazr/delegates/_python3.py'
--- lazr/delegates/_python3.py	1970-01-01 00:00:00 +0000
+++ lazr/delegates/_python3.py	2013-01-07 15:18:26 +0000
@@ -0,0 +1,38 @@
+# Copyright 2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.delegates.
+#
+# lazr.delegates 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.delegates 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.delegates.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Class decorator definition for Python 3.
+
+This syntax is not legal in Python 2.
+"""
+
+from zope.interface import classImplements
+
+from lazr.delegates._passthrough import Passthrough
+
+
+def delegate_to(*interfaces, context='context'):
+    if len(interfaces) == 0:
+        raise TypeError('At least one interface is required')
+    def _decorator(cls):
+        missing = object()
+        for interface in interfaces:
+            classImplements(cls, interface)
+            for name in interface:
+                if getattr(cls, name, missing) is missing:
+                    setattr(cls, name, Passthrough(name, context))
+        return cls
+    return _decorator

=== added directory 'lazr/delegates/docs'
=== added file 'lazr/delegates/docs/__init__.py'
=== added file 'lazr/delegates/docs/fixture.py'
--- lazr/delegates/docs/fixture.py	1970-01-01 00:00:00 +0000
+++ lazr/delegates/docs/fixture.py	2013-01-07 15:18:26 +0000
@@ -0,0 +1,34 @@
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.delegates
+#
+# lazr.delegates 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.delegates 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.delegates.  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

=== added file 'lazr/delegates/docs/usage.rst'
--- lazr/delegates/docs/usage.rst	1970-01-01 00:00:00 +0000
+++ lazr/delegates/docs/usage.rst	2013-01-07 15:18:26 +0000
@@ -0,0 +1,136 @@
+==============
+lazr.delegates
+==============
+
+The ``lazr.delegates`` package makes it easy to write objects that delegate
+behavior to another object. The new object adds some property or behavior on
+to the other object, while still providing the underlying interface, and
+delegating behavior.
+
+
+Usage
+=====
+
+The ``@delegate_to`` class decorator makes a class implement zero or more
+interfaces by delegating the implementation to another object.  In the case of
+a class providing an adapter, that object will be the *context*, but it can
+really be any object stored in an attribute.  So while the interfaces use an
+inheritance mechanism, the classes use a composition mechanism.
+
+For example, we can define two interfaces ``IFoo0`` and ``IFoo1`` where the
+latter inherits from the former.  The first interface defines an attribute.
+
+    >>> from zope.interface import Interface, Attribute
+    >>> class IFoo0(Interface):
+    ...     one = Attribute('attribute in IFoo0')
+
+The second (i.e. derived) interface defines a method and an attribute.
+
+    >>> class IFoo1(IFoo0):
+    ...     def bar():
+    ...         """A method in IFoo1"""
+    ...     baz = Attribute('attribute in IFoo1')
+
+We also define two classes that mirror the interfaces, and do something
+interesting.
+::
+
+    >>> class Foo0:
+    ...     one = 'one'
+
+    >>> class Foo1(Foo0):
+    ...     def bar(self):
+    ...         return 'bar'
+    ...     baz = 'I am baz'
+
+Finally, to tie everything together, we can define a class that delegates the
+implementation of ``IFoo1`` to an attribute on the instance.  By default,
+``self.context`` is used as the delegate attribute.
+
+    >>> from lazr.delegates import delegate_to
+    >>> @delegate_to(IFoo1)
+    ... class SomeClass:
+    ...     def __init__(self, context):
+    ...         self.context = context
+
+When the class doing the delegation is instantiated, an instance of the class
+implementing the interface is passed in.
+
+    >>> delegate = Foo1()
+    >>> s = SomeClass(delegate)
+
+Now, the ``bar()`` method comes from ``Foo1``.
+
+    >>> print(s.bar())
+    bar
+
+The ``baz`` attribute also comes from ``Foo1``.
+
+    >>> print(s.baz)
+    I am baz
+
+The ``one`` attribute comes from ``Foo0``.
+
+    >>> print(s.one)
+    one
+
+Even though the interface of ``SomeClass`` is defined through the delegate,
+the interface is still provided by the instance.
+
+    >>> IFoo1.providedBy(s)
+    True
+
+
+Custom context
+--------------
+
+The ``@delegate_to`` decorator takes an optional keyword argument to customize
+the attribute containing the object to delegate to.
+
+    >>> @delegate_to(IFoo1, context='myfoo')
+    ... class SomeOtherClass:
+    ...     def __init__(self, foo):
+    ...         self.myfoo = foo
+
+The attributes and methods are still delegated correctly.
+
+    >>> s = SomeOtherClass(delegate)
+    >>> print(s.bar())
+    bar
+    >>> print(s.baz)
+    I am baz
+
+
+Multiple interfaces
+===================
+
+The ``@delegate_to`` decorator accepts more than one interface.  Note however,
+that the context attribute must implement all of the named interfaces.
+
+    >>> class IFoo2(Interface):
+    ...     another = Attribute('another attribute')
+
+Here is a class that implements the interface.  It inherits from the
+implementation class that provides the ``IFoo0`` interface.  Thus does this
+class implement both interfaces.
+
+    >>> class Foo2(Foo0):
+    ...     another = 'I am another foo'
+
+Again, we tie it all together.
+
+    >>> @delegate_to(IFoo0, IFoo2)
+    ... class SomeOtherClass:
+    ...     def __init__(self, context):
+    ...         self.context = context
+
+Now, the instance of this class has all the expected attributes, and provides
+the expected interfaces.
+
+    >>> s = SomeOtherClass(Foo2())
+    >>> print(s.another)
+    I am another foo
+    >>> IFoo0.providedBy(s)
+    True
+    >>> IFoo2.providedBy(s)
+    True

=== added file 'lazr/delegates/docs/usage_fixture.py'
--- lazr/delegates/docs/usage_fixture.py	1970-01-01 00:00:00 +0000
+++ lazr/delegates/docs/usage_fixture.py	2013-01-07 15:18:26 +0000
@@ -0,0 +1,27 @@
+# Copyright 2009-2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.delegates
+#
+# lazr.delegates 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.delegates 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.delegates.  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.delegates.docs.fixture import globs

=== modified file 'lazr/delegates/tests/__init__.py'
--- src/lazr/delegates/tests/__init__.py	2009-03-24 19:51:29 +0000
+++ lazr/delegates/tests/__init__.py	2013-01-07 15:18:26 +0000
@@ -1,16 +0,0 @@
-# Copyright 2008 Canonical Ltd.  All rights reserved.
-#
-# This file is part of lazr.delegates.
-#
-# lazr.delegates 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.delegates 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.delegates.  If not, see <http://www.gnu.org/licenses/>.
-"""Tests for lazr.delegates"""

=== added file 'lazr/delegates/tests/test_api.py'
--- lazr/delegates/tests/test_api.py	1970-01-01 00:00:00 +0000
+++ lazr/delegates/tests/test_api.py	2013-01-07 15:18:26 +0000
@@ -0,0 +1,35 @@
+# Copyright 2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.delegates.
+#
+# lazr.delegates 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.delegates 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.delegates.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test the new API."""
+
+import unittest
+
+from lazr.delegates import delegate_to
+
+
+class TestAPI(unittest.TestCase):
+    """Test various corner cases in the API."""
+
+    def test_no_interfaces(self):
+        try:
+            @delegate_to()
+            class SomeClass(object):
+                pass
+        except TypeError:
+            pass
+        else:
+            self.fail('TypeError expected')

=== added file 'lazr/delegates/tests/test_passthrough.py'
--- lazr/delegates/tests/test_passthrough.py	1970-01-01 00:00:00 +0000
+++ lazr/delegates/tests/test_passthrough.py	2013-01-07 15:18:26 +0000
@@ -0,0 +1,85 @@
+# Copyright 2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.delegates.
+#
+# lazr.delegates 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.delegates 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.delegates.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test the Passthrough implementation."""
+
+import unittest
+
+from lazr.delegates._passthrough import Passthrough
+
+
+class Base:
+    foo = 'foo from Base'
+
+    @classmethod
+    def clsmethod(cls):
+        return cls.__name__
+
+
+class TestPassthrough(unittest.TestCase):
+    def setUp(self):
+        self.p = Passthrough('foo', 'mycontext')
+        self.p2 = Passthrough('clsmethod', 'mycontext')
+
+        self.base = Base()
+        class Adapter:
+            mycontext = self.base
+        self.Adapter = Adapter
+        self.adapter = Adapter()
+
+    def test_get(self):
+        self.assertEqual(self.p.__get__(self.adapter), 'foo from Base')
+        self.assertTrue(self.p.__get__(None, self.Adapter) is self.p)
+        self.assertEqual(self.p2.__get__(self.adapter)(), 'Base')
+
+    def test_set(self):
+        self.p.__set__(self.adapter, 'new value')
+        self.assertEqual(self.base.foo, 'new value')
+
+    def test_no_delete(self):
+        self.assertRaises(NotImplementedError,
+                          self.p.__delete__, self.adapter)
+
+    def test_adaptation(self):
+        # Passthrough's third argument (adaptation) is optional and, when
+        # provided, should be a zope.interface.Interface subclass (although in
+        # practice any callable will do) to which the instance is adapted
+        # before getting/setting the delegated attribute.
+        class HasNoFoo(object):
+            _foo = 1
+        no_foo = HasNoFoo()
+        # ... but IHasFooAdapter uses HasNoFoo._foo to provide its own .foo,
+        # so it works like an adapter for HasNoFoo into some interface that
+        # provides a 'foo' attribute.
+        class IHasFooAdapter(object):
+            def __init__(self, inst):
+                self.inst = inst
+            @property
+            def foo(self):
+                return self.inst._foo
+            @foo.setter
+            def foo(self, value):
+                self.inst._foo = value
+
+        class Example(object):
+            context = no_foo
+
+        p = Passthrough('foo', 'context', adaptation=IHasFooAdapter)
+        e = Example()
+
+        self.assertEqual(p.__get__(e), 1)
+        p.__set__(e, 2)
+        self.assertEqual(p.__get__(e), 2)

=== added file 'lazr/delegates/tests/test_python2.py'
--- lazr/delegates/tests/test_python2.py	1970-01-01 00:00:00 +0000
+++ lazr/delegates/tests/test_python2.py	2013-01-07 15:18:26 +0000
@@ -0,0 +1,166 @@
+# Copyright 2013 Canonical Ltd.  All rights reserved.
+#
+# This file is part of lazr.delegates.
+#
+# lazr.delegates 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.delegates 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.delegates.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Test the legacy API, which only works in Python 2.
+
+All of these tests are copied almost verbatim from the old README.rst.
+"""
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+
+# Don't enable the following or we can't test classic class failures.
+#__metaclass__ = type
+__all__ = [
+    'TestLegacyAPI',
+    ]
+
+
+import sys
+import unittest
+
+from zope.interface import Attribute, Interface, implements, providedBy
+
+from lazr.delegates import delegate_to
+if sys.version_info[0] == 2:
+    from lazr.delegates import delegates
+
+
+class IFoo0(Interface):
+    spoo = Attribute('attribute in IFoo0')
+
+class IFoo(IFoo0):
+    def bar():
+        'some method'
+    baz = Attribute('some attribute')
+
+class BaseFoo0:
+    spoo = 'some spoo'
+
+class BaseFoo(BaseFoo0):
+    def bar(self):
+        return 'bar'
+    baz = 'hi baz!'
+
+class IOther(Interface):
+    another = Attribute('another attribute')
+
+class BaseOtherFoo(BaseFoo):
+    another = 'yes, another'
+
+
+# Python 2.6 doesn't have skips.
+def skip_python3(cls):
+    if sys.version_info[0] > 2:
+        return None
+    return cls
+
+
+@skip_python3
+class TestLegacyAPI(unittest.TestCase):
+    def test_basic_usage(self):
+        class SomeClass(object):
+            delegates(IFoo)
+            def __init__(self, context):
+                self.context = context
+
+        f = BaseFoo()
+        s = SomeClass(f)
+        self.assertEqual(s.bar(), 'bar')
+        self.assertEqual(s.baz, 'hi baz!')
+        self.assertEqual(s.spoo, 'some spoo')
+        self.assertTrue(IFoo.providedBy(s))
+
+    def test_keyword_context(self):
+        class SomeOtherClass(object):
+            delegates(IFoo, context='myfoo')
+            def __init__(self, foo):
+                self.myfoo = foo
+            spoo = 'spoo from SomeOtherClass'
+
+        f = BaseFoo()
+        s = SomeOtherClass(f)
+        self.assertEqual(s.bar(), 'bar')
+        self.assertEqual(s.baz, 'hi baz!')
+        self.assertEqual(s.spoo, 'spoo from SomeOtherClass')
+
+        s.baz = 'fish'
+        self.assertEqual(s.baz, 'fish')
+        self.assertEqual(f.baz, 'fish')
+
+    def test_classic_is_error(self):
+        try:
+            class SomeClassicClass:
+                delegates(IFoo)
+        except TypeError:
+            pass
+        else:
+            self.fail('TypeError expected')
+
+    def test_use_outside_class_is_error(self):
+        self.assertRaises(TypeError, delegates, IFoo)
+
+    def test_multiple_interfaces(self):
+        class SomeOtherClass(object):
+            delegates([IFoo, IOther])
+
+        s = SomeOtherClass()
+        s.context = BaseOtherFoo()
+        self.assertEqual(s.another, 'yes, another')
+        self.assertEqual(s.baz, 'hi baz!')
+        self.assertEqual(s.spoo, 'some spoo')
+        self.assertTrue(IFoo.providedBy(s))
+        self.assertTrue(IOther.providedBy(s))
+
+    def test_decorate_existing_object(self):
+        class MoreFoo(BaseFoo, BaseOtherFoo):
+            implements([IFoo, IOther])
+
+        foo = MoreFoo()
+
+        class WithExtraTeapot(object):
+            delegates(providedBy(foo))
+            teapot = 'i am a teapot'
+
+        foo_with_teapot = WithExtraTeapot()
+        foo_with_teapot.context = foo
+
+        self.assertEqual(foo_with_teapot.baz, 'hi baz!')
+        self.assertEqual(foo_with_teapot.another, 'yes, another')
+        self.assertEqual(foo_with_teapot.teapot, 'i am a teapot')
+        self.assertTrue(IFoo.providedBy(foo_with_teapot))
+        self.assertTrue(IOther.providedBy(foo_with_teapot))
+
+
+@skip_python3
+class TestNewAPI(unittest.TestCase):
+    """Test corner cases in Python 2.
+
+    Most of the new API is tested in the doctest.  The implementation of the
+    new API is different between Python 2 and Python 3, so test these corner
+    cases.
+    """
+    def test_type_error(self):
+        # Too many arguments to @delegate_to() raises a TypeError.
+        try:
+            @delegate_to(IFoo0, context='myfoo', other='bogus')
+            class SomeClass(object):
+                pass
+        except TypeError:
+            pass
+        else:
+            self.fail('TypeError expected')

=== modified file 'lazr/delegates/version.txt'
--- src/lazr/delegates/version.txt	2010-07-16 13:23:43 +0000
+++ lazr/delegates/version.txt	2013-01-07 15:18:26 +0000
@@ -1,1 +1,1 @@
-1.2.0
+2.0

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2013-01-07 15:18:26 +0000
@@ -0,0 +1,9 @@
+[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.delegates
+pdb=1

=== modified file 'setup.py'
--- setup.py	2009-08-29 17:51:36 +0000
+++ setup.py	2013-01-07 15:18:26 +0000
@@ -1,6 +1,4 @@
-#!/usr/bin/env python
-
-# Copyright 2008-2009 Canonical Ltd.  All rights reserved.
+# Copyright 2008-2013 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
@@ -16,17 +14,16 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with lazr.delegates.  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
 def generate(*docname_or_string):
     res = []
     for value in docname_or_string:
-        if value.endswith('.txt'):
+        if value.endswith('.rst'):
             f = open(value)
             value = f.read()
             f.close()
@@ -36,22 +33,21 @@
     return '\n'.join(res)
 # end generic helpers
 
-__version__ = open("src/lazr/delegates/version.txt").read().strip()
+__version__ = open("lazr/delegates/version.txt").read().strip()
 
 setup(
     name='lazr.delegates',
     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/delegates/README.txt',
-        'src/lazr/delegates/NEWS.txt'),
+        'lazr/delegates/docs/usage.rst',
+        'lazr/delegates/NEWS.rst'),
     license='LGPL v3',
     install_requires=[
         'setuptools',
@@ -64,10 +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']
-    ),
-    test_suite='lazr.delegates.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/delegates/README.txt'
--- src/lazr/delegates/README.txt	2010-07-16 13:14:16 +0000
+++ src/lazr/delegates/README.txt	1970-01-01 00:00:00 +0000
@@ -1,292 +0,0 @@
-..
-    This file is part of lazr.delegates.
-
-    lazr.delegates 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.delegates 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.delegates.  If not, see <http://www.gnu.org/licenses/>.
-
-The ``lazr.delegates`` Package
-******************************
-
-The ``lazr.delegates`` package makes it easy to write objects that delegate
-behavior to another object. The new object adds some property or behavior on
-to the other object, while still providing the underlying interface, and
-delegating behavior.
-
-=====
-Usage
-=====
-
-The ``delegates`` function makes a class implement zero or more
-interfaces by delegating the implementation to another object. In the
-case of a class providing an adapter, that object will be the 'context',
-but it can really be any object stored in an attribute. So while the
-interfaces use an inheritance mechanism, the classes use a composition
-mechanism.
-
-For example we can define two interfaces IFoo0 <- IFoo...
-
-    >>> from lazr.delegates import delegates
-    >>> from zope.interface import Interface, Attribute
-    >>> class IFoo0(Interface):
-    ...     spoo = Attribute('attribute in IFoo0')
-
-    >>> class IFoo(IFoo0):
-    ...     def bar():
-    ...         "some method"
-    ...     baz = Attribute("some attribute")
-
-And two classes (BaseFoo0 <- BaseFoo) that do something interesting.
-
-    >>> class BaseFoo0:
-    ...     spoo = 'some spoo'
-
-    >>> class BaseFoo(BaseFoo0):
-    ...     def bar(self):
-    ...         return 'bar'
-    ...     baz = 'hi baz!'
-
-SomeClass can implement IFoo by delegating to an instance of BaseFoo
-stored in the 'context' attribute. Note that ``delegates`` takes the
-interface as the argument. By default, 'context' is the attribute
-containing the object to which the interface implementation is
-delegated.
-
-    >>> class SomeClass(object):
-    ...     delegates(IFoo)
-    ...     def __init__(self, context):
-    ...         self.context = context
-
-    >>> f = BaseFoo()
-    >>> s = SomeClass(f)
-    >>> s.bar()
-    'bar'
-
-    >>> s.baz
-    'hi baz!'
-
-    >>> s.spoo
-    'some spoo'
-
-    >>> IFoo.providedBy(s)
-    True
-
-The ``delegates()`` function takes an optional keyword argument to change
-attribute containing the object to delegate to. So an existing class,
-such as SomeOtherClass, can declare the name of the attribute to which to
-delegate.
-
-    >>> class SomeOtherClass(object):
-    ...     delegates(IFoo, context='myfoo')
-    ...     def __init__(self, foo):
-    ...         self.myfoo = foo
-    ...     spoo = 'spoo from SomeOtherClass'
-
-    >>> f = BaseFoo()
-    >>> s = SomeOtherClass(f)
-    >>> s.bar()
-    'bar'
-
-    >>> s.baz
-    'hi baz!'
-
-    >>> s.spoo
-    'spoo from SomeOtherClass'
-
-    >>> s.baz = 'fish'
-    >>> s.baz
-    'fish'
-
-    >>> f.baz
-    'fish'
-
-The ``delegates()`` function can only be used in new-style classes. An
-error is raised when a classic-style class is modified to implement an
-interface.
-
-    >>> class SomeClassicClass:
-    ...     delegates(IFoo)
-    Traceback (most recent call last):
-    ...
-    TypeError: Cannot use delegates() on a classic
-        class: __builtin__.SomeClassicClass.
-
-The ``delegates()`` function cannot be used out side of a class definition,
-such as in a module or in a function.
-
-    >>> delegates(IFoo)
-    Traceback (most recent call last):
-    ...
-    TypeError: delegates() can be used only from a class definition.
-
-Multiple interfaces can be specified by passing an iterable to
-delegates().
-
-    >>> class IOther(Interface):
-    ...     another = Attribute("another attribute")
-
-    >>> class BaseOtherFoo(BaseFoo):
-    ...     another = 'yes, another'
-
-    >>> class SomeOtherClass(object):
-    ...     delegates([IFoo, IOther])
-
-    >>> s = SomeOtherClass()
-    >>> s.context = BaseOtherFoo()
-    >>> s.another
-    'yes, another'
-
-    >>> s.baz
-    'hi baz!'
-
-    >>> s.spoo
-    'some spoo'
-
-    >>> IFoo.providedBy(s)
-    True
-
-    >>> IOther.providedBy(s)
-    True
-
-This can be convenient when decorating an existing object.
-
-    >>> from zope.interface import implements
-    >>> class MoreFoo(BaseFoo, BaseOtherFoo):
-    ...     implements(IFoo, IOther)
-
-    >>> foo = MoreFoo()
-
-    >>> from zope.interface import providedBy
-    >>> class WithExtraTeapot(object):
-    ...     delegates(providedBy(foo))
-    ...     teapot = 'i am a teapot'
-
-    >>> foo_with_teapot = WithExtraTeapot()
-    >>> foo_with_teapot.context = foo
-
-    >>> foo_with_teapot.baz
-    'hi baz!'
-
-    >>> foo_with_teapot.another
-    'yes, another'
-
-    >>> foo_with_teapot.teapot
-    'i am a teapot'
-
-    >>> IFoo.providedBy(foo_with_teapot)
-    True
-
-    >>> IOther.providedBy(foo_with_teapot)
-    True
-
-==============
-Implementation
-==============
-
-The Passthrough class is the implementation machinery of ``delegates()``. It
-uses the descriptor protocol to implement the delegation behaviour provided by
-``delegates()``. It takes at least two arguments: the name of the attribute
-that is delegated, and the name of the attribute containing the object to
-which to delegate.
-
-To illustrate, p and p2 are two Passthrough instances that use the
-instance assigned to 'mycontext' to call the 'foo' attribute and
-the 'clsmethod' method.
-
-    >>> from lazr.delegates import Passthrough
-    >>> p = Passthrough('foo', 'mycontext')
-    >>> p2 = Passthrough('clsmethod', 'mycontext')
-
-Base is a class the implements both 'foo' and 'clsmethod'.
-
-    >>> class Base:
-    ...     foo = 'foo from Base'
-    ...     def clsmethod(cls):
-    ...         return str(cls)
-    ...     clsmethod = classmethod(clsmethod)
-
-Adapter is a class that has an instance of Base assigned to the
-attribute 'mycontext'.
-
-    >>> base = Base()
-
-    >>> class Adapter:
-    ...     mycontext = base
-
-    >>> adapter = Adapter()
-
-The Passthrough instances can get and set their prescribed attributes
-when passed an instance of adapter.
-
-    >>> p.__get__(adapter)
-    'foo from Base'
-
-    >>> p.__get__(None, Adapter) is p
-    True
-
-    >>> p2.__get__(adapter)()
-    '__builtin__.Base'
-
-    >>> p.__set__(adapter, 'new value')
-    >>> base.foo
-    'new value'
-
-Passthrough does not implement __delete__. An error is raised if
-it is called.
-
-    >>> p.__delete__(adapter)
-    Traceback (most recent call last):
-    ...
-    NotImplementedError
-
-Passthrough's third argument (adaptation) is optional and, when provided,
-should be a zope.interface.Interface subclass (although in practice any
-callable will do) to which the instance is adapted before getting/setting the
-delegated attribute.
-
-    # HasNoFoo does not have a .foo attribute...
-    >>> class HasNoFoo(object):
-    ...     _foo = 1
-    >>> no_foo = HasNoFoo()
-
-    # ... but IHasFooAdapter uses HasNoFoo._foo to provide its own .foo, so it
-    # works like an adapter for HasNoFoo into some interface that provides
-    # a 'foo' attribute.
-    >>> class IHasFooAdapter(object):
-    ...     def __init__(self, inst):
-    ...         self.inst = inst
-    ...     def _get_foo(self):
-    ...         return self.inst._foo
-    ...     def _set_foo(self, value):
-    ...         self.inst._foo = value
-    ...     foo = property(_get_foo, _set_foo)
-
-    >>> class Example(object):
-    ...     context = no_foo
-
-    >>> p = Passthrough('foo', 'context', adaptation=IHasFooAdapter)
-    >>> e = Example()
-    >>> p.__get__(e)
-    1
-    >>> p.__set__(e, 2)
-    >>> p.__get__(e)
-    2
-
-
-===============
-Other Documents
-===============
-
-.. toctree::
-   :glob:
-
-   *
-   docs/*

=== removed file 'src/lazr/delegates/tests/test_docs.py'
--- src/lazr/delegates/tests/test_docs.py	2009-03-24 19:51:29 +0000
+++ src/lazr/delegates/tests/test_docs.py	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-# Copyright 2008-2009 Canonical Ltd.  All rights reserved.
-#
-# This file is part of lazr.delegates
-#
-# lazr.delegates 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.delegates 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.delegates.  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
-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.delegates', 'README.txt'))]
-    if resource_exists('lazr.delegates', 'docs'):
-        for name in resource_listdir('lazr.delegates', 'docs'):
-            if name.endswith('.txt'):
-                doctest_files.append(
-                    os.path.abspath(
-                        resource_filename('lazr.delegates', 'docs/%s' % name)))
-    kwargs = dict(module_relative=False, optionflags=DOCTEST_FLAGS)
-    atexit.register(cleanup_resources)
-    return unittest.TestSuite((
-        doctest.DocFileSuite(*doctest_files, **kwargs)))